summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-06-12 10:46:20 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-06-12 10:46:26 -0700
commita762e7bf8891adc575b8b75cf79b710952ad090c (patch)
treeb8ac872ff3112afa6e9aadc9dfde825116fea2ae
parent7fc1c095b5cb85afd90f47a7bf9a35495bcc64bd (diff)
downloadwebkit-a762e7bf8891adc575b8b75cf79b710952ad090c.tar.gz
Crash fix by checking null pointer
bug:6579681 Regression from https://android-git.corp.google.com/g/#/c/197452/ Change-Id: If185faec6bb2d014c304afbb8ff752ebfc6e4b51
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp
index df417a3c1..c9c887ab6 100644
--- a/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp
@@ -144,7 +144,7 @@ bool ImageTexture::equalsCRC(unsigned crc)
// Return 0 if the image does not meet the repeatable criteria.
unsigned int ImageTexture::getImageTextureId()
{
- return m_tileGrid->getImageTextureId();
+ return m_tileGrid ? m_tileGrid->getImageTextureId() : 0;
}
int ImageTexture::nbTextures()