Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SJOW's equality hook returns true too much. bug 413902, r+sr=jst a=damons

Browse Source
This commit is contained in:
mrbkap@gmail.com 2008-01-29 18:06:17 -08:00
parent 17f5f4406d
commit 96076d19b0
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/xpconnect/src/XPCSafeJSObjectWrapper.cpp
View File

@ -956,9 +956,21 @@ XPC_SJOW_Equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
JSObject *other = JSVAL_TO_OBJECT(v);
JSObject *otherUnsafe = GetUnsafeObject(other);
*bp = (obj == other || unsafeObj == other ||
(unsafeObj && unsafeObj == otherUnsafe) ||
XPC_GetIdentityObject(cx, obj) == XPC_GetIdentityObject(cx, other));
// An object is equal to a SJOW if:
// - The other object is the same SJOW.
// - The other object is the object that this SJOW is wrapping.
// - The other object is a SJOW wrapping the same object as this one.
// or
// - Both objects somehow wrap the same native object.
if (obj == other || unsafeObj == other ||
(unsafeObj && unsafeObj == otherUnsafe)) {
*bp = JS_TRUE;
} else {
nsISupports *objIdentity = XPC_GetIdentityObject(cx, obj);
nsISupports *otherIdentity = XPC_GetIdentityObject(cx, other);
*bp = objIdentity && objIdentity == otherIdentity;
}
}
return JS_TRUE;

13
js/src/xpconnect/tests/mochitest/test_wrappers.html
View File

@ -44,6 +44,19 @@
expected.sort().toString(),
'enumeration over SJOWs walks the prototype chain and works over XOWs');
ok(!(new XPCSafeJSObjectWrapper({}) == new XPCSafeJSObjectWrapper({})),
'SJOWs equality hook returns false correctly');
let (obj = {}) {
ok(new XPCSafeJSObjectWrapper(obj) == new XPCSafeJSObjectWrapper(obj),
'SJOWs equality hook returns true correctly');
}
ok(new XPCSafeJSObjectWrapper(window) == new XPCNativeWrapper(window),
'SJOWs equality hook returns true correctly against XPCNW');
ok(new XPCSafeJSObjectWrapper(window) == window,
'SJOWs equality hook returns true correctly against XOW');
var origProto = window.__proto__;
try {
window.__proto__ = window;