Bug 828958 - audit uses of DeserializeURI r=bent, a=milan

netwerk/protocol/http/HttpChannelParent.cpp

@@ -131,6 +131,11 @@ HttpChannelParent::RecvAsyncOpen(const URIParams&           aURI,
                                  const bool&                allowSpdy)
 {
   nsCOMPtr<nsIURI> uri = DeserializeURI(aURI);
+  if (!uri) {
+    // URIParams does MOZ_ASSERT if null, but we need to protect opt builds from
+    // null deref here.
+    return SendFailedAsyncOpen(NS_ERROR_ILLEGAL_VALUE);
+  }
   nsCOMPtr<nsIURI> originalUri = DeserializeURI(aOriginalURI);
   nsCOMPtr<nsIURI> docUri = DeserializeURI(aDocURI);
   nsCOMPtr<nsIURI> referrerUri = DeserializeURI(aReferrerURI);

uriloader/exthandler/ExternalHelperAppParent.cpp

@@ -112,6 +112,10 @@ ExternalHelperAppParent::~ExternalHelperAppParent()
 NS_IMETHODIMP
 ExternalHelperAppParent::GetName(nsACString& aResult)
 {
+  if (!mURI) {
+    aResult.Truncate();
+    return NS_ERROR_NOT_AVAILABLE;
+  }
   mURI->GetAsciiSpec(aResult);
   return NS_OK;
 }