Bug 1194153 - Chrome Registry's convertChromeURL shouldn't crash when…

… given a null url, r=bsmedberg.
Brli · Sep 4, 2015 · ae9218f · ae9218f
1 parent f9293d2
commit ae9218f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp
@@ -265,7 +265,9 @@ NS_IMETHODIMP
 nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult)
 {
   nsresult rv;
-  NS_ASSERTION(aChromeURI, "null url!");
+  if (NS_WARN_IF(!aChromeURI)) {
+    return NS_ERROR_INVALID_ARG;
+  }
 
   if (mOverrideTable.Get(aChromeURI, aResult))
     return NS_OK;