SERVER-24128 reject embedded null bytes in namespace string parsing

2 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/db/exec/group.cpp b/src/mongo/db/exec/group.cpp
index 5ec8226c431..37ce67ad9fc 100644
--- a/src/mongo/db/exec/group.cpp
+++ b/src/mongo/db/exec/group.cpp
@@ -96,9 +96,8 @@ Status GroupStage::initGroupScripting() {
     const std::string userToken =
         AuthorizationSession::get(Client::getCurrent())->getAuthenticatedUserNamesToken();
 
-    const NamespaceString nss(_request.ns);
     _scope = getGlobalScriptEngine()->getPooledScope(
-        getOpCtx(), nss.db().toString(), "group" + userToken);
+        getOpCtx(), _request.ns.db().toString(), "group" + userToken);
     if (!_request.reduceScope.isEmpty()) {
         _scope->init(&_request.reduceScope);
     }
diff --git a/src/mongo/db/exec/group.h b/src/mongo/db/exec/group.h
index 7ec5efe647f..95b8a788a1d 100644
--- a/src/mongo/db/exec/group.h
+++ b/src/mongo/db/exec/group.h
@@ -30,6 +30,7 @@
 
 #include "mongo/bson/simple_bsonobj_comparator.h"
 #include "mongo/db/exec/plan_stage.h"
+#include "mongo/db/namespace_string.h"
 #include "mongo/scripting/engine.h"
 
 namespace mongo {
@@ -41,7 +42,7 @@ class Collection;
  */
 struct GroupRequest {
     // Namespace to operate on (e.g. "foo.bar").
-    std::string ns;
+    NamespaceString ns;
 
     // A predicate describing the set of documents to group.
     BSONObj query;