corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1134968. If JS_NewObjectWithGivenProto is passed a null parent and null proto, use the context's current global as the parent. r=waldo

Browse Source
This commit is contained in:
Boris Zbarsky
2015-02-24 16:04:22 -05:00
parent 0780c698de
commit d8d38e06f2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/jsobj.cpp
View File

@@ -1267,11 +1267,16 @@ js::NewObjectWithGivenTaggedProto(ExclusiveContext *cxArg, const Class *clasp,
/*
* Default parent to the parent of the prototype, which was set from
* the parent of the prototype's constructor.
* the parent of the prototype's constructor. If there is no
* prototype, use the global.
*/
RootedObject parent(cxArg, parentArg);
if (!parent && proto.isObject())
parent = proto.toObject()->getParent();
if (!parent) {
if (proto.isObject())
parent = proto.toObject()->getParent();
else
parent = cxArg->global();
}
RootedObject obj(cxArg, NewObject(cxArg, group, parent, allocKind, newKind));
if (!obj)