summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2012-07-24 22:00:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-24 22:00:52 -0700
commitf35e08fefff71bb9b84b679f8d13cf57c6e1d756 (patch)
tree957814fe40ce99226385f4925a57de8348abae6f
parentceeb43093b8e721dfe6671d7da44c1d1fd6f6ed8 (diff)
parent0e8bb60087a019d104b6eb4aa8abd11bd91b16c4 (diff)
downloadexternal_webkit-f35e08fefff71bb9b84b679f8d13cf57c6e1d756.zip
external_webkit-f35e08fefff71bb9b84b679f8d13cf57c6e1d756.tar.gz
external_webkit-f35e08fefff71bb9b84b679f8d13cf57c6e1d756.tar.bz2
am 0e8bb600: Null check to fix crash
* commit '0e8bb60087a019d104b6eb4aa8abd11bd91b16c4': Null check to fix crash
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp4
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;
}