Bug 1009624 - startup crash in nsXULPrototypeDocument::GetCompilationGlobal() , r=bholley

content/xul/content/src/nsXULElement.cpp

@@ -2628,7 +2628,7 @@ nsXULPrototypeScript::Compile(JS::SourceBufferHolder& aSrcBuf,
                               nsIOffThreadScriptReceiver *aOffThreadReceiver /* = nullptr */)
 {
     // We'll compile the script in the compilation scope.
-    MOZ_ASSERT(aProtoDoc);
+    NS_ENSURE_STATE(aProtoDoc);
     NS_ENSURE_TRUE(xpc::GetCompilationScope(), NS_ERROR_UNEXPECTED);
     AutoSafeJSContext cx;
     JSAutoCompartment ac(cx, xpc::GetCompilationScope());

content/xul/document/src/XULDocument.cpp

@@ -3551,7 +3551,7 @@ XULDocument::OnStreamComplete(nsIStreamLoader* aLoader,
 
             rv = mCurrentScriptProto->Compile(srcBuf,
                                               uri, 1, this,
-                                              mCurrentPrototype,
+                                              mMasterPrototype,
                                               this);
             if (NS_SUCCEEDED(rv) && !mCurrentScriptProto->GetScriptObject()) {
                 // We will be notified via OnOffThreadCompileComplete when the