diff options
| author | Kris Maglione <maglione.k@gmail.com> | 2020-08-28 07:05:07 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-08-28 07:05:07 +0000 |
| commit | 226fea3868129374d6047c7f8fc2a5c02c97dee1 (patch) | |
| tree | 5c35b604d369c17178e24fee77a8f91cad3d9521 /dom | |
| parent | 4358ff62a563938549c79684044cd423e94737c1 (diff) | |
| download | UXP-226fea3868129374d6047c7f8fc2a5c02c97dee1.tar UXP-226fea3868129374d6047c7f8fc2a5c02c97dee1.tar.gz UXP-226fea3868129374d6047c7f8fc2a5c02c97dee1.tar.lz UXP-226fea3868129374d6047c7f8fc2a5c02c97dee1.tar.xz UXP-226fea3868129374d6047c7f8fc2a5c02c97dee1.zip | |
[DOM] Only construct JS-implemented objects if inner window is current.
Diffstat (limited to 'dom')
| -rw-r--r-- | dom/bindings/BindingUtils.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp index ee321772e..aeccc84bc 100644 --- a/dom/bindings/BindingUtils.cpp +++ b/dom/bindings/BindingUtils.cpp @@ -2516,6 +2516,12 @@ ConstructJSImplementation(const char* aContractId, { AutoNoJSAPI nojsapi; + nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(aGlobal); + if (!window->IsCurrentInnerWindow()) { + aRv.Throw(NS_ERROR_FAILURE); + return; + } + // Get the XPCOM component containing the JS implementation. nsresult rv; nsCOMPtr<nsISupports> implISupports = do_CreateInstance(aContractId, &rv); @@ -2530,7 +2536,6 @@ ConstructJSImplementation(const char* aContractId, // and our global is a window. nsCOMPtr<nsIDOMGlobalPropertyInitializer> gpi = do_QueryInterface(implISupports); - nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(aGlobal); if (gpi) { JS::Rooted<JS::Value> initReturn(RootingCx()); rv = gpi->Init(window, &initReturn); |