Make the URI of an nsIImageLoadingContent immutable. Bug 337246, r=biesi, sr=sicking

content/base/src/nsImageLoadingContent.cpp

@@ -376,8 +376,12 @@ nsImageLoadingContent::GetCurrentURI(nsIURI** aURI)
     return mCurrentRequest->GetURI(aURI);
   }
 
-  NS_IF_ADDREF(*aURI = mCurrentURI);
-  return NS_OK;
+  if (!mCurrentURI) {
+    *aURI = nsnull;
+    return NS_OK;
+  }
+  
+  return NS_EnsureSafeToReturn(mCurrentURI, aURI);
 }
 
 NS_IMETHODIMP
@@ -445,6 +449,8 @@ nsImageLoadingContent::LoadImage(const nsAString& aNewURI,
   NS_ENSURE_SUCCESS(rv, rv);
   // XXXbiesi fire onerror if that failed?
 
+  NS_TryToSetImmutable(imageURI);
+
   return LoadImage(imageURI, aForce, aNotify, doc);
 }
 

content/base/src/nsObjectLoadingContent.cpp

@@ -705,6 +705,8 @@ nsObjectLoadingContent::LoadObject(const nsAString& aURI,
     return NS_OK;
   }
 
+  NS_TryToSetImmutable(uri);
+
   return LoadObject(uri, aNotify, aTypeHint, aForceLoad);
 }