wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 860572 - Use Rooted<JSPropertyDescriptor> in XPCComponents; r=bholley

Browse Source
This commit is contained in:
Terrence Cole 2013-04-12 17:42:59 -07:00
parent 7aae601b79
commit a0e6ca8ef3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/xpconnect/src/XPCComponents.cpp
View File

@ -2709,15 +2709,15 @@ nsXPCComponents_Utils::LookupMethod(const JS::Value& object,
// Alright, now do the lookup.
*retval = JSVAL_VOID;
JSPropertyDescriptor desc;
if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, &desc))
Rooted<JSPropertyDescriptor> desc(cx);
if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, desc.address()))
return NS_ERROR_FAILURE;
// First look for a method value. If that's not there, try a getter,
// since historically lookupMethod also works for getters.
JSObject *methodObj = desc.value.isObject() ? &desc.value.toObject() : NULL;
if (!methodObj && (desc.attrs & JSPROP_GETTER))
methodObj = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
JSObject *methodObj = desc.value().isObject() ? &desc.value().toObject() : NULL;
if (!methodObj && desc.hasGetterObject())
methodObj = desc.getterObject();
// Callers of this function seem to expect bound methods. Make it happen.
// Note that this is unnecessary until bug 658909 is fixed.