diff options
| author | Bart Sears <bsears@google.com> | 2012-07-24 22:03:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-24 22:03:08 -0700 |
| commit | 2bbb442aa27ea29ef6337eba9021ea509400cb84 (patch) | |
| tree | 7574a64881b6ee1a7221aa6cdabf96c98713576c | |
| parent | ab49bbea6d85b1c1c6b26c66f402091724712349 (diff) | |
| parent | f35e08fefff71bb9b84b679f8d13cf57c6e1d756 (diff) | |
| download | external_webkit-2bbb442aa27ea29ef6337eba9021ea509400cb84.zip external_webkit-2bbb442aa27ea29ef6337eba9021ea509400cb84.tar.gz external_webkit-2bbb442aa27ea29ef6337eba9021ea509400cb84.tar.bz2 | |
am f35e08fe: am 0e8bb600: Null check to fix crash
* commit 'f35e08fefff71bb9b84b679f8d13cf57c6e1d756':
Null check to fix crash
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp index c9c887a..aa84427 100644 --- a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp @@ -131,7 +131,9 @@ unsigned ImageTexture::computeCRC(const SkBitmap* bitmap) return 0; bitmap->lockPixels(); uint8_t* img = static_cast<uint8_t*>(bitmap->getPixels()); - unsigned crc = computeCrc(img, bitmap->getSize()); + unsigned crc = 0; + if (img) + crc = computeCrc(img, bitmap->getSize()); bitmap->unlockPixels(); return crc; } |