SERVER-39350 Make `opMsgRequestFromAnyProtocol` return owned request messages

2 files changed, 5 insertions, 1 deletions

diff --git a/src/mongo/rpc/factory.cpp b/src/mongo/rpc/factory.cpp
index 64bc5372142..475bcc6191e 100644
--- a/src/mongo/rpc/factory.cpp
+++ b/src/mongo/rpc/factory.cpp
@@ -71,7 +71,7 @@ std::unique_ptr<ReplyInterface> makeReply(const Message* unownedMessage) {
 OpMsgRequest opMsgRequestFromAnyProtocol(const Message& unownedMessage) {
     switch (unownedMessage.operation()) {
         case mongo::dbMsg:
-            return OpMsgRequest::parse(unownedMessage);
+            return OpMsgRequest::parseOwned(unownedMessage);
         case mongo::dbQuery:
             return opMsgRequestFromLegacyRequest(unownedMessage);
         default:
diff --git a/src/mongo/rpc/op_msg.h b/src/mongo/rpc/op_msg.h
index 86bfa8d130e..5983ed63226 100644
--- a/src/mongo/rpc/op_msg.h
+++ b/src/mongo/rpc/op_msg.h
@@ -123,6 +123,10 @@ struct OpMsgRequest : public OpMsg {
         return OpMsgRequest(OpMsg::parse(message));
     }
 
+    static OpMsgRequest parseOwned(const Message& message) {
+        return OpMsgRequest(OpMsg::parseOwned(message));
+    }
+
     static OpMsgRequest fromDBAndBody(StringData db,
                                       BSONObj body,
                                       const BSONObj& extraFields = {}) {