SERVER-10313: uassert if null char in js field names

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
index 527c9b0fd5c..36d246f307c 100644
--- a/src/mongo/scripting/engine_v8.cpp
+++ b/src/mongo/scripting/engine_v8.cpp
@@ -1575,6 +1575,14 @@ namespace mongo {
     void V8Scope::v8ToMongoElement(BSONObjBuilder & b, const StringData& sname,
                                    v8::Handle<v8::Value> value, int depth,
                                    BSONObj* originalParent) {
+
+        // Null char should be at the end, not in the string
+        uassert(16981,
+                str::stream() << "JavaScript property (name) contains a null char "
+                              << "which is not allowed in BSON. "
+                              << originalParent->jsonString(),
+                (string::npos == sname.find('\0')) );
+
         if (value->IsString()) {
             b.append(sname, V8String(value));
             return;