Merge 122418 -

Source/WebCore/html/ImageInputType.cpp

Index: Source/WebCore/html/ImageInputType.cpp
===================================================================
--- Source/WebCore/html/ImageInputType.cpp	(revision 122791)
+++ Source/WebCore/html/ImageInputType.cpp	(working copy)
@@ -190,7 +190,7 @@
             return height;
 
         // If the image is available, use its height.
-        if (m_imageLoader->image())
+        if (m_imageLoader && m_imageLoader->image())
             return m_imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height();
     }
 
@@ -211,7 +211,7 @@
             return width;
 
         // If the image is available, use its width.
-        if (m_imageLoader->image())
+        if (m_imageLoader && m_imageLoader->image())
             return m_imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width();
     }