From 3b82e4dbebd08dd449708ef3448514583791e8c4 Mon Sep 17 00:00:00 2001
From: "kmcclusk%netscape.com"
 <kmcclusk%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 12 Dec 2001 01:41:41 +0000
Subject: [PATCH] Check for null result from NS_NewURI b=102585 sr=kin
 r=attinasi

git-svn-id: svn://10.0.0.236/trunk@110336 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsImageLoader.cpp     | 5 +++++
 mozilla/layout/base/src/nsImageLoader.cpp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/mozilla/layout/base/nsImageLoader.cpp b/mozilla/layout/base/nsImageLoader.cpp
index 529a927ef60..9c1910f8c64 100644
--- a/mozilla/layout/base/nsImageLoader.cpp
+++ b/mozilla/layout/base/nsImageLoader.cpp
@@ -105,6 +105,11 @@ nsImageLoader::Load(const nsAReadableString &aURI)
 
   NS_NewURI(getter_AddRefs(uri), aURI, baseURI);
 
+  // NS_NewURI can fail to return a uri instance
+  if (uri == nsnull) {
+    return NS_ERROR_FAILURE;
+  }
+
   if (mRequest) {
     nsCOMPtr<nsIURI> oldURI;
     mRequest->GetURI(getter_AddRefs(oldURI));
diff --git a/mozilla/layout/base/src/nsImageLoader.cpp b/mozilla/layout/base/src/nsImageLoader.cpp
index 529a927ef60..9c1910f8c64 100644
--- a/mozilla/layout/base/src/nsImageLoader.cpp
+++ b/mozilla/layout/base/src/nsImageLoader.cpp
@@ -105,6 +105,11 @@ nsImageLoader::Load(const nsAReadableString &aURI)
 
   NS_NewURI(getter_AddRefs(uri), aURI, baseURI);
 
+  // NS_NewURI can fail to return a uri instance
+  if (uri == nsnull) {
+    return NS_ERROR_FAILURE;
+  }
+
   if (mRequest) {
     nsCOMPtr<nsIURI> oldURI;
     mRequest->GetURI(getter_AddRefs(oldURI));