Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't lock non-native objects (417819, r=mrbkap).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@245818 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org 2008-02-16 06:53:32 +00:00
parent 6a64d3ca61
commit b5c9b4be14
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/js/src/jsapi.c
View File

@ -2841,16 +2841,19 @@ JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto)
*/
if (obj->map->ops->setProto)
return obj->map->ops->setProto(cx, obj, JSSLOT_PROTO, proto);
OBJ_SET_PROTO(cx, obj, proto);
#else
JS_LOCK_OBJ(cx, obj);
if (OBJ_IS_NATIVE(obj) && !js_GetMutableScope(cx, obj)) {
if (OBJ_IS_NATIVE(obj)) {
JS_LOCK_OBJ(cx, obj);
if (!js_GetMutableScope(cx, obj)) {
JS_UNLOCK_OBJ(cx, obj);
return JS_FALSE;
}
LOCKED_OBJ_SET_PROTO(obj, proto);
JS_UNLOCK_OBJ(cx, obj);
return JS_FALSE;
return JS_TRUE;
}
LOCKED_OBJ_SET_PROTO(obj, proto);
JS_UNLOCK_OBJ(cx, obj);
#endif
OBJ_SET_PROTO(cx, obj, proto);
return JS_TRUE;
}