Ensure document keys can't contain NULL character (JAVA-891)

Author: rozza

src/main/com/mongodb/DBCollection.java

@@ -1444,10 +1444,12 @@ private void _checkValue(final Object value) {
      * @exception IllegalArgumentException if the key is not valid.
      */
     private void validateKey(String s ) {
+        if ( s.contains( "\0" ) )
+            throw new IllegalArgumentException( "Document field names can't have a NULL character. (Bad Key: '" + s + "')" );
         if ( s.contains( "." ) )
-            throw new IllegalArgumentException( "fields stored in the db can't have . in them. (Bad Key: '" + s + "')" );
+            throw new IllegalArgumentException( "Document field names can't have a . in them. (Bad Key: '" + s + "')" );
         if ( s.startsWith( "$" ) )
-            throw new IllegalArgumentException( "fields stored in the db can't start with '$' (Bad Key: '" + s + "')" );
+            throw new IllegalArgumentException( "Document field names can't start with '$' (Bad Key: '" + s + "')" );
     }
 
     /**

src/main/org/bson/BasicBSONEncoder.java

@@ -201,6 +201,9 @@ protected void _putObjectField( String name , Object val ){
             return;
 
         if ( DEBUG ) System.out.println( "\t put thing : " + name );
+
+        if ( name.contains( "\0" ) )
+            throw new IllegalArgumentException( "Document field names can't have a NULL character. (Bad Key: '" + name + "')" );
 
         if ( name.equals( "$where") && val instanceof String ){
             _put( CODE , name );

src/test/com/mongodb/DBCollectionTest.java

@@ -346,6 +346,26 @@ public void testDotKeysFail() {
         DBObject obj = BasicDBObjectBuilder.start().add("x",1).add("y",2).add("foo.bar","baz").get();
         c.insert(obj);
     }
+
+    @Test( expectedExceptions = IllegalArgumentException.class )
+    public void testNullKeysFail() {
+        DBCollection c = _db.getCollection("testnullkeysFail");
+        c.drop();
+
+        DBObject obj = BasicDBObjectBuilder.start().add("x",1).add("y",2).add("foo\0bar","baz").get();
+        c.insert(obj);
+    }
+
+    @Test( expectedExceptions = IllegalArgumentException.class )
+    public void testNullKeysFailWhenNested() {
+        DBCollection c = _db.getCollection("testnullkeysFailWhenNested");
+        c.drop();
+
+        final BasicDBList list = new BasicDBList();
+        list.add(new BasicDBObject("foo\0bar","baz"));
+        DBObject obj = BasicDBObjectBuilder.start().add("x", list).get();
+        c.insert(obj);
+    }
 
     @Test
     public void testLazyDocKeysPass() {

src/test/org/bson/BSONTest.java

@@ -82,6 +82,14 @@ public void testBasic1()
 
         _test( new BasicBSONObject( "x" , 4 ) , 12 , "d1ed8dbf79b78fa215e2ded74548d89d" );
     }
+
+    @Test( expectedExceptions = IllegalArgumentException.class )
+    public void testNullKeysFail() {
+        BSONEncoder e = new BasicBSONEncoder();
+        OutputBuffer buf = new BasicOutputBuffer();
+        e.set( buf );
+        e.putObject( new BasicBSONObject( "foo\0bar","baz" ) );
+    }
 
     @Test
     public void testArray()