diff -r 79859ed3eea9 -r 919f36ff910f webengine/osswebengine/WebCore/loader/CachedImage.cpp --- a/webengine/osswebengine/WebCore/loader/CachedImage.cpp Tue Aug 31 16:17:46 2010 +0300 +++ b/webengine/osswebengine/WebCore/loader/CachedImage.cpp Wed Sep 01 12:28:30 2010 +0100 @@ -98,12 +98,11 @@ static Image* brokenImage() { - static OwnPtr brokenImage; + static Image* brokenImage; if (!brokenImage) { - brokenImage.set(Image::loadPlatformResource("missingImage")); + brokenImage = Image::loadPlatformResource("missingImage"); } - Image* ret = brokenImage.get(); - return ret; + return brokenImage; } static Image* nullImage() @@ -188,7 +187,8 @@ // Have the image update its data from its internal buffer. // It will not do anything now, but will delay decoding until // queried for info (like size or specific image frames). - sizeAvailable = m_image->setData(m_data, allDataReceived); + if(m_image) + sizeAvailable = m_image->setData(m_data, allDataReceived); // Go ahead and tell our observers to try to draw if we have either // received all the data or the size is known. Each chunk from the