Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't assume that all XOWs are equal. bug 391497, r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@232168 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2007-08-15 21:13:49 +00:00
parent a471939e41
commit 06bb5de0d7
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/js/src/xpconnect/src/XPCCrossOriginWrapper.cpp
View File

@@ -324,11 +324,19 @@ WrapSameOriginProp(JSContext *cx, JSObject *outerObj, jsval *vp)
}
JSObject *wrappedObj = JSVAL_TO_OBJECT(*vp);
const char *name = JS_GET_CLASS(cx, wrappedObj)->name;
if (XPC_XOW_ClassNeedsXOW(name)) {
JSClass *clasp = JS_GET_CLASS(cx, wrappedObj);
if (XPC_XOW_ClassNeedsXOW(clasp->name)) {
return XPC_XOW_WrapObject(cx, JS_GetGlobalForObject(cx, outerObj), vp);
}
// Check if wrappedObj is an XOW. If so, verify that it's from the
// right scope.
if (clasp == &sXPC_XOW_JSClass.base &&
JS_GetParent(cx, wrappedObj) != JS_GetParent(cx, outerObj)) {
*vp = OBJECT_TO_JSVAL(GetWrappedObject(cx, wrappedObj));
return XPC_XOW_WrapObject(cx, JS_GetParent(cx, outerObj), vp);
}
if (JS_ObjectIsFunction(cx, wrappedObj) &&
JS_GetFunctionNative(cx, reinterpret_cast<JSFunction *>
(JS_GetPrivate(cx, wrappedObj))) ==
@@ -383,9 +391,10 @@ XPC_XOW_RewrapIfNeeded(JSContext *cx, JSObject *outerObj, jsval *vp)
return XPC_XOW_WrapFunction(cx, outerObj, obj, vp);
}
// Don't need to wrap non-C++-implemented objects.
// Note: This catches attempts to double-wrap cross origin wrappers.
if (!XPCWrappedNative::GetWrappedNativeOfJSObject(cx, obj)) {
if (JS_GET_CLASS(cx, obj) == &sXPC_XOW_JSClass.base &&
JS_GetParent(cx, outerObj) != JS_GetParent(cx, obj)) {
*vp = OBJECT_TO_JSVAL(GetWrappedObject(cx, obj));
} else if (!XPCWrappedNative::GetWrappedNativeOfJSObject(cx, obj)) {
return JS_TRUE;
}