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

15
js/ipc/JavaScriptChild.cpp
View File

@@ -251,13 +251,18 @@ JavaScriptChild::AnswerDefineProperty(const ObjectId &objId, const nsString &id,
if (!convertGeckoStringToId(cx, id, &internedId))
return fail(cx, rs);
JSPropertyDescriptor desc;
if (!toDescriptor(cx, descriptor, &desc))
Rooted<JSPropertyDescriptor> desc(cx);
if (!toDescriptor(cx, descriptor, desc.address()))
return false;
RootedValue v(cx, desc.value);
if (!js::CheckDefineProperty(cx, obj, internedId, v, desc.getter, desc.setter, desc.attrs) ||
!JS_DefinePropertyById(cx, obj, internedId, v, desc.getter, desc.setter, desc.attrs))
if (!js::CheckDefineProperty(cx, obj, internedId, desc.value(), desc.getter(),
desc.setter(), desc.attributes()))
{
return fail(cx, rs);
}
if (!JS_DefinePropertyById(cx, obj, internedId, desc.value(), desc.getter(),
desc.setter(), desc.attributes()))
{
return fail(cx, rs);
}