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

fix npe in fix

Browse Source
This commit is contained in:
Eliot Horowitz
2009-07-23 18:58:32 -04:00
parent a4a3d19ce1
commit 767d576ca4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripting/engine_spidermonkey.cpp
View File

@@ -710,11 +710,13 @@ namespace mongo {
assert( JS_SetProperty( cx , obj , s.c_str() , &val ) );
holder->_inResolve = false;
if ( JSVAL_IS_OBJECT( val ) &&
( JS_InstanceOf( cx , JSVAL_TO_OBJECT( val ) , &bson_class , 0 ) ||
JS_IsArrayObject( cx , JSVAL_TO_OBJECT( val ) ) ) ){
if ( val != JSVAL_NULL && val != JSVAL_VOID && JSVAL_IS_OBJECT( val ) ){
// TODO: this is a hack to get around sub objects being modified
holder->_modified = true;
JSObject * oo = JSVAL_TO_OBJECT( val );
if ( JS_InstanceOf( cx , oo , &bson_class , 0 ) ||
JS_IsArrayObject( cx , oo ) ){
holder->_modified = true;
}
}
*objp = obj;