xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure db doesn't crash with weird db.eval returns SERVER-159

Browse Source
This commit is contained in:
Eliot Horowitz
2009-07-15 11:41:23 -04:00
parent 2d8e4fd3a0
commit 294f9e4873
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scripting/engine_spidermonkey.cpp
View File

@@ -149,27 +149,30 @@ namespace mongo {
BSONObjBuilder b;
jsval theid = getProperty( o , "_id" );
if ( ! JSVAL_IS_VOID( theid ) ){
append( b , "_id" , theid );
if ( ! appendSpecialDBObject( this , b , "value" , o ) ){
jsval theid = getProperty( o , "_id" );
if ( ! JSVAL_IS_VOID( theid ) ){
append( b , "_id" , theid );
}
JSIdArray * properties = JS_Enumerate( _context , o );
assert( properties );
for ( jsint i=0; i<properties->length; i++ ){
jsid id = properties->vector[i];
jsval nameval;
assert( JS_IdToValue( _context ,id , &nameval ) );
string name = toString( nameval );
if ( name == "_id" )
continue;
append( b , name , getProperty( o , name.c_str() ) , orig[name].type() );
}
JS_DestroyIdArray( _context , properties );
}
JSIdArray * properties = JS_Enumerate( _context , o );
assert( properties );
for ( jsint i=0; i<properties->length; i++ ){
jsid id = properties->vector[i];
jsval nameval;
assert( JS_IdToValue( _context ,id , &nameval ) );
string name = toString( nameval );
if ( name == "_id" )
continue;
append( b , name , getProperty( o , name.c_str() ) , orig[name].type() );
}
JS_DestroyIdArray( _context , properties );
return b.obj();
}