diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 709d0346adc..4ca876d3ccf 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -1990,9 +1990,12 @@ nsImageFrame::RealLoadImage(const nsAString& aSpec, nsIPresContext *aPresContext /* get the URI, convert internal-gopher-stuff if needed */ nsCOMPtr uri; GetURI(aSpec, getter_AddRefs(uri)); - if (!uri) + if (!uri) { + if (!realURI) + return NS_ERROR_FAILURE; uri = realURI; - + } + /* set this back to FALSE before we do the real load */ mInitialLoadCompleted = PR_FALSE; diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 709d0346adc..4ca876d3ccf 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -1990,9 +1990,12 @@ nsImageFrame::RealLoadImage(const nsAString& aSpec, nsIPresContext *aPresContext /* get the URI, convert internal-gopher-stuff if needed */ nsCOMPtr uri; GetURI(aSpec, getter_AddRefs(uri)); - if (!uri) + if (!uri) { + if (!realURI) + return NS_ERROR_FAILURE; uri = realURI; - + } + /* set this back to FALSE before we do the real load */ mInitialLoadCompleted = PR_FALSE;