summaryrefslogtreecommitdiff
path: root/dom
diff options
context:
space:
mode:
authorPale Moon <git-repo@palemoon.org>2018-06-10 01:53:05 +0200
committerPale Moon <git-repo@palemoon.org>2018-06-10 01:53:05 +0200
commitdea50cbf6aca6d22f6c56d1acc616a5f0e087b53 (patch)
tree68a7855d6774aa214550a9c8ae9d70607ce4c1c8 /dom
parent4463c7031398d263969ee3d12fb93d28ba59fcc6 (diff)
downloadpalemoon-gre-dea50cbf6aca6d22f6c56d1acc616a5f0e087b53.tar.gz
Add a nullcheck in DOMProxyHandler::EnsureExpandoObject
Diffstat (limited to 'dom')
-rw-r--r--dom/bindings/DOMJSProxyHandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/bindings/DOMJSProxyHandler.cpp b/dom/bindings/DOMJSProxyHandler.cpp
index f0ebf4385..e121ff65c 100644
--- a/dom/bindings/DOMJSProxyHandler.cpp
+++ b/dom/bindings/DOMJSProxyHandler.cpp
@@ -121,6 +121,10 @@ DOMProxyHandler::EnsureExpandoObject(JSContext* cx, JS::Handle<JSObject*> obj)
nsISupports* native = UnwrapDOMObject<nsISupports>(obj);
nsWrapperCache* cache;
CallQueryInterface(native, &cache);
+ if (!cache) {
+ return expando;
+ }
+
if (expandoAndGeneration) {
cache->PreserveWrapper(native);
expandoAndGeneration->expando.setObject(*expando);