diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-06-12 14:53:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 14:53:20 -0700 |
| commit | 11940b97c9773c0c5dc1dd97a5fa841ea2ea6f8f (patch) | |
| tree | 9598db4d6d9abbeea976f3ef3b60561dad01bd69 /Source/WebCore/platform/graphics | |
| parent | 94e6f9cda3c33584f4671f40f0652d7414d8dfc0 (diff) | |
| parent | 45476c6e0ef00a22165e498b3a8d673d46b6d1c6 (diff) | |
| download | external_webkit-11940b97c9773c0c5dc1dd97a5fa841ea2ea6f8f.zip external_webkit-11940b97c9773c0c5dc1dd97a5fa841ea2ea6f8f.tar.gz external_webkit-11940b97c9773c0c5dc1dd97a5fa841ea2ea6f8f.tar.bz2 | |
am 45476c6e: am a762e7bf: Crash fix by checking null pointer
* commit '45476c6e0ef00a22165e498b3a8d673d46b6d1c6':
Crash fix by checking null pointer
Diffstat (limited to 'Source/WebCore/platform/graphics')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/ImageTexture.cpp | 2 |
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 df417a3..c9c887a 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() |