--- a/webengine/osswebengine/WebCore/loader/CachedImage.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebCore/loader/CachedImage.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -98,11 +98,12 @@
 
 static Image* brokenImage()
 {
-    static Image* brokenImage;
+    static OwnPtr<Image*> brokenImage;
     if (!brokenImage) {
-        brokenImage = Image::loadPlatformResource("missingImage");
+        brokenImage.set(Image::loadPlatformResource("missingImage"));
     }
-    return brokenImage;
+    Image* ret = brokenImage.get();
+    return ret;
 }
 
 static Image* nullImage()
@@ -187,8 +188,7 @@
     // 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).
-    if(m_image)
-        sizeAvailable = m_image->setData(m_data, allDataReceived);
+    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