Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 531364 - Change up the order of these calls. r=peterv sr=bzbarsky

Browse Source
This commit is contained in:
Blake Kaplan 2009-12-17 16:21:57 -08:00
parent 1d20b32eab
commit 26fefbada4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/base/nsDOMClassInfo.cpp
View File

@ -7415,8 +7415,6 @@ nsEventReceiverSH::AddEventListenerHelper(JSContext *cx, JSObject *obj,
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, obj);
nsresult rv = sXPConnect->GetJSObjectOfWrapper(cx, obj, &obj);
if (NS_FAILED(rv)) {
nsDOMClassInfo::ThrowJSException(cx, rv);
@ -7424,6 +7422,11 @@ nsEventReceiverSH::AddEventListenerHelper(JSContext *cx, JSObject *obj,
return JS_FALSE;
}
OBJ_TO_INNER_OBJECT(cx, obj);
if (!obj) {
return JS_FALSE;
}
// Check that the caller has permission to call obj's addEventListener.
if (NS_FAILED(sSecMan->CheckPropertyAccess(cx, obj,
JS_GET_CLASS(cx, obj)->name,