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

Bug 902249 - Fix some exact rooting hazards in js/ipc; r=jonco

Browse Source
This commit is contained in:
Terrence Cole
2013-08-07 16:15:57 -07:00
parent 311831c0c9
commit 7edcc85b2d
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/ipc/JavaScriptShared.cpp
View File

@@ -375,16 +375,18 @@ JavaScriptShared::toDescriptor(JSContext *cx, const PPropertyDescriptor &in, JSP
out->shortid = in.shortid();
if (!toValue(cx, in.value(), &out->value))
return false;
if (!unwrap(cx, in.objId(), &out->obj))
Rooted<JSObject*> obj(cx);
if (!unwrap(cx, in.objId(), &obj))
return false;
out->obj = obj;
if (!in.getter()) {
out->getter = NULL;
} else if (in.attrs() & JSPROP_GETTER) {
JSObject *getter;
Rooted<JSObject*> getter(cx);
if (!unwrap(cx, in.getter(), &getter))
return false;
out->getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, getter);
out->getter = JS_DATA_TO_FUNC_PTR(JSPropertyOp, getter.get());
} else {
if (in.getter() == DefaultPropertyOp)
out->getter = JS_PropertyStub;
@@ -395,10 +397,10 @@ JavaScriptShared::toDescriptor(JSContext *cx, const PPropertyDescriptor &in, JSP
if (!in.setter()) {
out->setter = NULL;
} else if (in.attrs() & JSPROP_SETTER) {
JSObject *setter;
Rooted<JSObject*> setter(cx);
if (!unwrap(cx, in.setter(), &setter))
return false;
out->setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, setter);
out->setter = JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, setter.get());
} else {
if (in.setter() == DefaultPropertyOp)
out->setter = JS_StrictPropertyStub;