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

Bug 1514776 - Enter the unwrapped object's realm before calling aes.ReportException() in nsXPCWrappedJSClass::CheckForException. r=bzbarsky

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14851

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jan de Mooij 2018-12-21 08:53:09 +00:00
parent cf908f9f73
commit 1672f1efbd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/xpconnect/src/XPCWrappedJSClass.cpp
View File

@ -762,8 +762,9 @@ void nsXPCWrappedJSClass::CleanupOutparams(const nsXPTMethodInfo* info,
}
nsresult nsXPCWrappedJSClass::CheckForException(
XPCCallContext& ccx, AutoEntryScript& aes, const char* aPropertyName,
const char* anInterfaceName, Exception* aSyntheticException) {
XPCCallContext& ccx, AutoEntryScript& aes, HandleObject aObj,
const char* aPropertyName, const char* anInterfaceName,
Exception* aSyntheticException) {
JSContext* cx = ccx.GetJSContext();
MOZ_ASSERT(cx == aes.cx());
RefPtr<Exception> xpc_exception = aSyntheticException;
@ -826,6 +827,10 @@ nsresult nsXPCWrappedJSClass::CheckForException(
// just so that we can tell the JS engine to pass it back to us via the
// error reporting callback. This is all very dumb.
JS_SetPendingException(cx, js_exception);
// Enter the unwrapped object's realm. This is the realm that was used to
// enter the AutoEntryScript.
JSAutoRealm ar(cx, js::UncheckedUnwrap(aObj));
aes.ReportException();
reportable = false;
}
@ -968,7 +973,7 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16_t methodIndex,
// Throw and warn for good measure.
JS_ReportErrorASCII(cx, "%s", str);
NS_WARNING(str);
return CheckForException(ccx, aes, name, GetInterfaceName());
return CheckForException(ccx, aes, obj, name, GetInterfaceName());
}
RootedValue fval(cx);
@ -1145,7 +1150,7 @@ pre_call_clean_up:
}
if (!success) {
return CheckForException(ccx, aes, name, GetInterfaceName(),
return CheckForException(ccx, aes, obj, name, GetInterfaceName(),
syntheticException);
}

5
js/xpconnect/src/xpcprivate.h
View File

@ -1664,12 +1664,15 @@ class nsXPCWrappedJSClass final : public nsIXPCWrappedJSClass {
nsIVariant** aResult);
private:
// aObj is the nsXPCWrappedJS's object. We used this as the callee (or |this|
// if getter or setter).
// aSyntheticException, if not null, is the exception we should be using.
// If null, look for an exception on the JSContext hanging off the
// XPCCallContext.
static nsresult CheckForException(
XPCCallContext& ccx, mozilla::dom::AutoEntryScript& aes,
const char* aPropertyName, const char* anInterfaceName,
JS::HandleObject aObj, const char* aPropertyName,
const char* anInterfaceName,
mozilla::dom::Exception* aSyntheticException = nullptr);
virtual ~nsXPCWrappedJSClass();