diff options
| author | Marco Nelissen <marcone@google.com> | 2012-05-07 11:24:13 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2012-05-07 11:24:13 -0700 |
| commit | b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011 (patch) | |
| tree | 2a100fae4d7aa3a52ff8a4b611a966f0d1f40f6b | |
| parent | 43b8fd76c03fe4d3c46919e98af91a18176c2654 (diff) | |
| download | frameworks_base-b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011.zip frameworks_base-b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011.tar.gz frameworks_base-b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011.tar.bz2 | |
Fix crash when decoding bitmap
Externally reported crash when decoding corrupted .wmf file.
b/5048623
Change-Id: I1df0861cd36983cb4d1460caa221c54d3fc240af
| -rw-r--r-- | core/jni/android/graphics/BitmapFactory.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 47ed2c1..3a6c5b0 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -360,6 +360,9 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, // already have a pixelref installed. pr = bitmap->pixelRef(); } + if (pr == NULL) { + return nullObjectReturn("Got null SkPixelRef"); + } if (!isMutable) { // promise we will never change our pixels (great for sharing and pictures) |