From 0e8bb60087a019d104b6eb4aa8abd11bd91b16c4 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Mon, 23 Jul 2012 14:47:41 -0700 Subject: Null check to fix crash Need to make sure that img is not zero. bug: 6864545 Change-Id: I2a2c5440347681b462abaa5ac9101ddb6137c8c4 --- Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp') 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(bitmap->getPixels()); - unsigned crc = computeCrc(img, bitmap->getSize()); + unsigned crc = 0; + if (img) + crc = computeCrc(img, bitmap->getSize()); bitmap->unlockPixels(); return crc; } -- cgit v1.1