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 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 oldURI; mRequest->GetURI(getter_AddRefs(oldURI));