Bug 1377402 - Add null check in SimpleGlobalObject's class hooks r=sfink

jonco3 · jonco3 · commit 3bd056fab830 · 2018-01-08T14:27:50.000Z
diff --git a/dom/bindings/SimpleGlobalObject.cpp b/dom/bindings/SimpleGlobalObject.cpp
@@ -46,16 +46,20 @@ SimpleGlobal_finalize(js::FreeOp *fop, JSObject *obj)
 {
   SimpleGlobalObject* globalObject =
     static_cast<SimpleGlobalObject*>(JS_GetPrivate(obj));
-  globalObject->ClearWrapper(obj);
-  NS_RELEASE(globalObject);
+  if (globalObject) {
+    globalObject->ClearWrapper(obj);
+    NS_RELEASE(globalObject);
+  }
 }
 
 static size_t
 SimpleGlobal_moved(JSObject *obj, JSObject *old)
 {
   SimpleGlobalObject* globalObject =
     static_cast<SimpleGlobalObject*>(JS_GetPrivate(obj));
-  globalObject->UpdateWrapper(obj, old);
+  if (globalObject) {
+    globalObject->UpdateWrapper(obj, old);
+  }
   return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,16 +46,20 @@ SimpleGlobal_finalize(js::FreeOp fop, JSObject obj)`
`46`	`46`	`{`
`47`	`47`	`SimpleGlobalObject* globalObject =`
`48`	`48`	`static_cast<SimpleGlobalObject*>(JS_GetPrivate(obj));`
`49`		`- globalObject->ClearWrapper(obj);`
`50`		`- NS_RELEASE(globalObject);`
	`49`	`+ if (globalObject) {`
	`50`	`+ globalObject->ClearWrapper(obj);`
	`51`	`+ NS_RELEASE(globalObject);`
	`52`	`+ }`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`static size_t`
`54`	`56`	`SimpleGlobal_moved(JSObject obj, JSObject old)`
`55`	`57`	`{`
`56`	`58`	`SimpleGlobalObject* globalObject =`
`57`	`59`	`static_cast<SimpleGlobalObject*>(JS_GetPrivate(obj));`
`58`		`- globalObject->UpdateWrapper(obj, old);`
	`60`	`+ if (globalObject) {`
	`61`	`+ globalObject->UpdateWrapper(obj, old);`
	`62`	`+ }`
`59`	`63`	`return 0;`
`60`	`64`	`}`
`61`	`65`