Don't truncate strings at NUL byte in BSONElement::String()

2 files changed, 15 insertions, 1 deletions

diff --git a/src/mongo/bson/bsonelement.h b/src/mongo/bson/bsonelement.h
index 11600d01331..753a89d2704 100644
--- a/src/mongo/bson/bsonelement.h
+++ b/src/mongo/bson/bsonelement.h
@@ -65,7 +65,7 @@ namespace mongo {
 
             std::string foo = obj["foo"].String(); // std::exception if not a std::string type or DNE
         */
-        std::string String()        const { return chk(mongo::String).valuestr(); }
+        std::string String()        const { return chk(mongo::String).str(); }
         Date_t Date()               const { return chk(mongo::Date).date(); }
         double Number()             const { return chk(isNumber()).number(); }
         double Double()             const { return chk(NumberDouble)._numberDouble(); }
diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
index ded17334641..d655c771c9d 100644
--- a/src/mongo/dbtests/jsobjtests.cpp
+++ b/src/mongo/dbtests/jsobjtests.cpp
@@ -911,6 +911,19 @@ namespace JsobjTests {
             }
         };
 
+        class StringWithNull {
+        public:
+            void run() {
+                const string input = string("a") + '\0' + 'b';
+                ASSERT_EQUALS(input.size(), 3U);
+
+                BSONObj obj = BSON("str" << input);
+                const string output = obj.firstElement().String();
+                ASSERT_EQUALS(escape(output), escape(input)); // for better failure output
+                ASSERT_EQUALS(output, input);
+            }
+        };
+
         namespace Validation {
 
             class Base {
@@ -2183,6 +2196,7 @@ namespace JsobjTests {
             add< BSONObjTests::ArrayAppendAs >();
             add< BSONObjTests::GetField >();
             add< BSONObjTests::ToStringRecursionDepth >();
+            add< BSONObjTests::StringWithNull >();
 
             add< BSONObjTests::Validation::BadType >();
             add< BSONObjTests::Validation::EooBeforeEnd >();