Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@198735 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-05-31 15:58:43 +00:00
parent 897c6c82d6
commit fb477fa6d5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/content/base/src/nsImageLoadingContent.cpp
View File

@@ -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);
}