Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 591014: Null-check mImage in imgRequestProxy::GetStaticRequest. r=joe a=blocking-beta5

Browse Source
This commit is contained in:
Daniel Holbert 2010-08-26 20:47:20 +00:00
parent f67506d13c
commit 8aea711d81
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/libpr0n/src/imgRequestProxy.cpp
View File

@ -727,7 +727,7 @@ imgRequestProxy::GetStaticRequest(imgIRequest** aReturn)
*aReturn = nsnull;
PRBool animated;
if (NS_SUCCEEDED(mImage->GetAnimated(&animated)) && !animated) {
if (!mImage || (NS_SUCCEEDED(mImage->GetAnimated(&animated)) && !animated)) {
// Early exit - we're not animated, so we don't have to do anything.
NS_ADDREF(*aReturn = this);
return NS_OK;
@ -795,7 +795,7 @@ void imgRequestProxy::SyncNotifyListener()
void
imgRequestProxy::SetImage(Image* aImage)
{
NS_ABORT_IF_FALSE(!mImage, "Setting null image");
NS_ABORT_IF_FALSE(aImage, "Setting null image");
NS_ABORT_IF_FALSE(!mImage, "Setting image when we already have one");
mImage = aImage;