SERVER-31516 Fix improper initialization of empty NamespaceString.

2 files changed, 13 insertions, 1 deletions

diff --git a/src/mongo/db/namespace_string-inl.h b/src/mongo/db/namespace_string-inl.h
index c3bb251b98f..a9fce83e12f 100644
--- a/src/mongo/db/namespace_string-inl.h
+++ b/src/mongo/db/namespace_string-inl.h
@@ -118,7 +118,7 @@ inline bool NamespaceString::validCollectionName(StringData coll) {
     return true;
 }
 
-inline NamespaceString::NamespaceString() : _ns(), _dotIndex(0) {}
+inline NamespaceString::NamespaceString() : _ns(), _dotIndex(std::string::npos) {}
 inline NamespaceString::NamespaceString(StringData nsIn) {
     _ns = nsIn.toString();  // copy to our buffer
     _dotIndex = _ns.find('.');
diff --git a/src/mongo/db/namespace_string_test.cpp b/src/mongo/db/namespace_string_test.cpp
index 9de487b1327..c32c2c7bef8 100644
--- a/src/mongo/db/namespace_string_test.cpp
+++ b/src/mongo/db/namespace_string_test.cpp
@@ -392,4 +392,16 @@ TEST(NamespaceStringTest, makeListIndexesNSIsCorrect) {
     ASSERT(ns.isListIndexesCursorNS());
     ASSERT_EQUALS(NamespaceString("DB.COLL"), ns.getTargetNSForListIndexes());
 }
+
+TEST(NamespaceStringTest, EmptyNSStringReturnsEmptyColl) {
+    NamespaceString nss{};
+    ASSERT_TRUE(nss.isEmpty());
+    ASSERT_EQ(nss.coll(), StringData{});
+}
+
+TEST(NamespaceStringTest, EmptyNSStringReturnsEmptyDb) {
+    NamespaceString nss{};
+    ASSERT_TRUE(nss.isEmpty());
+    ASSERT_EQ(nss.db(), StringData{});
+}
 }