Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-15 22:44:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

De-confuse GetWrappedNativeOfJSObject about wrappers around the outer object. bug 391055, r+sr=jst

Browse Source
This commit is contained in:
mrbkap@gmail.com 2007-08-07 18:54:48 -07:00
parent 1e49925451
commit 3989bcdf70
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/xpconnect/src/xpcwrappednative.cpp
View File

@ -1367,6 +1367,15 @@ return_tearoff:
{
JSObject *outer = ((JSExtendedClass*)clazz)->outerObject(cx, obj);
// Protect against infinite recursion through XOWs.
JSObject *unsafeObj;
clazz = JS_GET_CLASS(cx, outer);
if(clazz == &sXPC_XOW_JSClass.base &&
(unsafeObj = XPCWrapper::Unwrap(cx, outer)))
{
outer = unsafeObj;
}
if(outer && outer != obj)
return GetWrappedNativeOfJSObject(cx, outer, funobj, pobj2,
pTearOff);