From 2fd5c7a2ab77095ab6f01eb8bf1bf7f4fae39bbc Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Mon, 24 May 2010 10:18:52 -0400
Subject: check for null on extremely large images

The new PrivateAndroidImageSourceRec allocator may return null
if the image sizes are extremely large. Check for this to avoid
a null deference.

Change-Id: Ia129a87a1794a2696a4e1e415a940ac2b6b50064
http://b/2689053
---
 WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WebCore')

diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
index 914a9d6..c0ef611 100644
--- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
@@ -303,7 +303,7 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
     }
 
     PrivateAndroidImageSourceRec* decoder = m_decoder.m_image;
-    if (allDataReceived && !decoder->fAllDataReceived) {
+    if (allDataReceived && decoder && !decoder->fAllDataReceived) {
         decoder->fAllDataReceived = true;
 
         SkBitmap* bm = &decoder->bitmap();
-- 
cgit v1.1