Bug 994335 - Null-check aProtoDoc in nsXULPrototypeScript::Serialize. r=smaug, a=sledru

bholley · bholley · commit 508da78185be · 2014-04-14T14:40:49.000-07:00
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
@@ -2392,6 +2392,7 @@ nsXULPrototypeScript::Serialize(nsIObjectOutputStream* aStream,
                                 nsXULPrototypeDocument* aProtoDoc,
                                 const nsCOMArray<nsINodeInfo> *aNodeInfos)
 {
+    NS_ENSURE_TRUE(aProtoDoc, NS_ERROR_UNEXPECTED);
     AutoSafeJSContext cx;
     JS::Rooted<JSObject*> global(cx, aProtoDoc->GetCompilationGlobal());
     NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);

Original file line number	Diff line number	Diff line change
`@@ -2392,6 +2392,7 @@ nsXULPrototypeScript::Serialize(nsIObjectOutputStream* aStream,`
`2392`	`2392`	`nsXULPrototypeDocument* aProtoDoc,`
`2393`	`2393`	`const nsCOMArray<nsINodeInfo> *aNodeInfos)`
`2394`	`2394`	`{`
	`2395`	`+ NS_ENSURE_TRUE(aProtoDoc, NS_ERROR_UNEXPECTED);`
`2395`	`2396`	`AutoSafeJSContext cx;`
`2396`	`2397`	`JS::Rooted<JSObject*> global(cx, aProtoDoc->GetCompilationGlobal());`
`2397`	`2398`	`NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);`