SERVER-24128 reject embedded null bytes in namespace string parsing

1 files changed, 5 insertions, 7 deletions

diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp
index 359e97292c5..ccba3bfb41a 100644
--- a/src/mongo/db/commands/test_commands.cpp
+++ b/src/mongo/db/commands/test_commands.cpp
@@ -81,22 +81,20 @@ public:
                      int,
                      string& errmsg,
                      BSONObjBuilder& result) {
-        string coll = cmdObj["godinsert"].valuestrsafe();
-        log() << "test only command godinsert invoked coll:" << coll;
-        uassert(13049, "godinsert must specify a collection", !coll.empty());
-        string ns = dbname + "." + coll;
+        const NamespaceString nss(parseNsCollectionRequired(dbname, cmdObj));
+        log() << "test only command godinsert invoked coll:" << nss.coll();
         BSONObj obj = cmdObj["obj"].embeddedObjectUserCheck();
 
         ScopedTransaction transaction(txn, MODE_IX);
         Lock::DBLock lk(txn->lockState(), dbname, MODE_X);
-        OldClientContext ctx(txn, ns);
+        OldClientContext ctx(txn, nss.ns());
         Database* db = ctx.db();
 
         WriteUnitOfWork wunit(txn);
         UnreplicatedWritesBlock unreplicatedWritesBlock(txn);
-        Collection* collection = db->getCollection(ns);
+        Collection* collection = db->getCollection(nss);
         if (!collection) {
-            collection = db->createCollection(txn, ns);
+            collection = db->createCollection(txn, nss.ns());
             if (!collection) {
                 errmsg = "could not create collection";
                 return false;