fix Object.bsonsize with null param SERVER-1753

2 files changed, 15 insertions, 4 deletions

diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp
index 8952b339702..ed7aae47b5d 100644
--- a/scripting/engine_spidermonkey.cpp
+++ b/scripting/engine_spidermonkey.cpp
@@ -959,10 +959,16 @@ namespace mongo {
             JS_ReportError( cx , "bsonsize requires one valid object" );
             return JS_FALSE;
         }
+
+        Convertor c(cx);
         
+        if ( argv[0] == JSVAL_VOID || argv[0] == JSVAL_NULL ){
+            *rval = c.toval( 0.0 );
+            return JS_TRUE;
+        }
+
         JSObject * o = JSVAL_TO_OBJECT( argv[0] );
 
-        Convertor c(cx);
         double size = 0;
 
         if ( JS_InstanceOf( cx , o , &bson_ro_class , 0 ) ||
diff --git a/scripting/v8_db.cpp b/scripting/v8_db.cpp
index 2ccca1c7c0c..f4acac001d9 100644
--- a/scripting/v8_db.cpp
+++ b/scripting/v8_db.cpp
@@ -737,9 +737,14 @@ namespace mongo {
     
     v8::Handle<v8::Value> bsonsize( const v8::Arguments& args ) {
         
-        if (args.Length() != 1 || !args[ 0 ]->IsObject()) {
-            return v8::ThrowException( v8::String::New( "bonsisze needs 1 object" ) );
-        }
+        if ( args.Length() != 1 )
+            return v8::ThrowException( v8::String::New( "bonsisze needs 1 argument" ) );
+
+        if ( args[0]->IsNull() )
+            return v8::Number::New(0);
+
+        if ( ! args[ 0 ]->IsObject() ) 
+            return v8::ThrowException( v8::String::New( "argument to bonsisze has to be an object" ) );
 
         return v8::Number::New( v8ToMongo( args[ 0 ]->ToObject() ).objsize() );
     }