diff options
| author | Marco Nelissen <marcone@google.com> | 2012-05-07 12:09:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 12:09:02 -0700 |
| commit | b3482ffbeee30650359e6ab8f3950a83e06963b4 (patch) | |
| tree | a9d4e84c8d5646061e88c315fb58166925666cc8 /core/jni/android | |
| parent | 7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0 (diff) | |
| parent | b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011 (diff) | |
| download | frameworks_base-b3482ffbeee30650359e6ab8f3950a83e06963b4.zip frameworks_base-b3482ffbeee30650359e6ab8f3950a83e06963b4.tar.gz frameworks_base-b3482ffbeee30650359e6ab8f3950a83e06963b4.tar.bz2 | |
Merge "Fix crash when decoding bitmap" into jb-dev
Diffstat (limited to 'core/jni/android')
| -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) |