diff options
| author | Cary Clark <cary@android.com> | 2010-05-24 07:30:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-24 07:30:03 -0700 |
| commit | a6b27f6414840349e0cc946ce02d9e9f37a12340 (patch) | |
| tree | a71b5d037b000ab5d034837ca702e70c522f6c84 | |
| parent | 456bff2bd280c649e2600ab43edf65e0d4e7e217 (diff) | |
| parent | 2fd5c7a2ab77095ab6f01eb8bf1bf7f4fae39bbc (diff) | |
| download | external_webkit-a6b27f6414840349e0cc946ce02d9e9f37a12340.zip external_webkit-a6b27f6414840349e0cc946ce02d9e9f37a12340.tar.gz external_webkit-a6b27f6414840349e0cc946ce02d9e9f37a12340.tar.bz2 | |
Merge "check for null on extremely large images"
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |