Merge "Fix for native crash on image decode OOM" into jb-mr1-dev

2012-09-20 23:25:26 -07:00
parent 74defbf202 005bfc694d
commit 3034d45104
1 changed files with 3 additions and 1 deletions
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -340,7 +340,9 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,

        bitmap->setConfig(config, scaledWidth, scaledHeight);
        bitmap->setIsOpaque(decoded->isOpaque());
-        bitmap->allocPixels(&javaAllocator, NULL);
+        if (!bitmap->allocPixels(&javaAllocator, NULL)) {
+            return nullObjectReturn("allocation failed for scaled bitmap");
+        }
        bitmap->eraseColor(0);

        SkPaint paint;