From 835800e35082f138beed2a732dda9a78a25992e9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 15 Jan 2012 09:13:11 +0100 Subject: [PATCH] Bug 717216 - Don't return nsnull from nsXBLDocGlobalObject::EnsureScriptEnvironment; r=volkmar --- content/xbl/src/nsXBLDocumentInfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp index 9beba60952a..d60ea865795 100644 --- a/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/content/xbl/src/nsXBLDocumentInfo.cpp @@ -305,7 +305,7 @@ nsXBLDocGlobalObject::EnsureScriptEnvironment(PRUint32 aLangID) if (mScriptContext) return NS_OK; // already initialized for this lang nsCOMPtr factory = do_GetService(kDOMScriptObjectFactoryCID); - NS_ENSURE_TRUE(factory, nsnull); + NS_ENSURE_TRUE(factory, NS_OK); nsresult rv; @@ -328,7 +328,7 @@ nsXBLDocGlobalObject::EnsureScriptEnvironment(PRUint32 aLangID) rv = xpc_CreateGlobalObject(cx, &gSharedGlobalClass, principal, nsnull, false, &mJSObject, &compartment); - NS_ENSURE_SUCCESS(rv, nsnull); + NS_ENSURE_SUCCESS(rv, NS_OK); ::JS_SetGlobalObject(cx, mJSObject);