Merge branch 'master' of git@github.com:mongodb/mongo

2 files changed, 7 insertions, 3 deletions

diff --git a/jstests/sharding/shard5.js b/jstests/sharding/shard5.js
index 0d519c068ca..2553b8e8c84 100644
--- a/jstests/sharding/shard5.js
+++ b/jstests/sharding/shard5.js
@@ -40,7 +40,7 @@ print( "* A" );
 assert.eq( 7 , s.getDB( "test" ).foo.find().toArray().length , "normal B 1" );
 
 s2.getDB( "test" ).foo.save( { num : 2 } );
-sleep( 200 ); // give the write back time to happen
+sleep( 500 ); // give the write back time to happen
 assert.eq( 8 , s2.getDB( "test" ).foo.find().toArray().length , "other B 2" );
 
 s.stop();
diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp
index 2fb4beecdb8..f450a1e8c03 100644
--- a/scripting/engine_spidermonkey.cpp
+++ b/scripting/engine_spidermonkey.cpp
@@ -156,7 +156,9 @@ namespace mongo {
                 
                 append( b , name , getProperty( o , name.c_str() ) , orig[name].type() );
             }
-            
+                        
+            JS_DestroyIdArray( _context , properties );
+
             return b.obj();
         }
         
@@ -486,13 +488,15 @@ namespace mongo {
                 assert( JS_ValueToId( cx , c.toval( name.c_str() ) , idp ) );
             }
             else {
+                delete it;
                 *statep = 0;
             }
             return JS_TRUE;
         }
         
         if ( enum_op == JSENUMERATE_DESTROY ){
-            delete it;
+            if ( it ) 
+                delete it;
             return JS_TRUE;
         }