From b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Mon, 7 May 2012 11:24:13 -0700
Subject: [PATCH] Fix crash when decoding bitmap

Externally reported crash when decoding corrupted .wmf file.
b/5048623

Change-Id: I1df0861cd36983cb4d1460caa221c54d3fc240af
---
 core/jni/android/graphics/BitmapFactory.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 47ed2c1723e1b..3a6c5b0f8e137 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)