Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 86da174de8df (bug 719841)

Browse Source
This commit is contained in:
Geoff Lankow 2012-01-21 11:26:40 +13:00
parent 6a0b6f53cf
commit eee791ac56
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/jsobj.cpp
View File

@ -188,15 +188,26 @@ obj_setProto(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
} }
if (!vp->isObjectOrNull()) if (!vp->isObjectOrNull())
return true; return JS_TRUE;
JSObject *pobj = vp->toObjectOrNull(); JSObject *pobj = vp->toObjectOrNull();
if (pobj) {
/*
* Innerize pobj here to avoid sticking unwanted properties on the
* outer object. This ensures that any with statements only grant
* access to the inner object.
*/
OBJ_TO_INNER_OBJECT(cx, pobj);
if (!pobj)
return JS_FALSE;
}
uintN attrs; uintN attrs;
id = ATOM_TO_JSID(cx->runtime->atomState.protoAtom); id = ATOM_TO_JSID(cx->runtime->atomState.protoAtom);
if (!CheckAccess(cx, obj, id, JSAccessMode(JSACC_PROTO|JSACC_WRITE), vp, &attrs)) if (!CheckAccess(cx, obj, id, JSAccessMode(JSACC_PROTO|JSACC_WRITE), vp, &attrs))
return false; return JS_FALSE;
return SetProto(cx, obj, pobj, true); return SetProto(cx, obj, pobj, JS_TRUE);
} }
#else /* !JS_HAS_OBJ_PROTO_PROP */ #else /* !JS_HAS_OBJ_PROTO_PROP */