am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev

* commit '80a058b3033200835f86ee0e61367a87a470cde8': Do not attempt to decode NULL SkData.
2013-10-08 06:35:04 -07:00
parent d386c0a4f3 80a058b303
commit 97b707d5eb
1 changed files with 3 additions and 0 deletions
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -514,6 +514,9 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi
    }

    SkAutoTUnref<SkData> data(SkData::NewFromFD(descriptor));
+    if (data.get() == NULL) {
+        return nullObjectReturn("NewFromFD failed in nativeDecodeFileDescriptor");
+    }
    SkAutoTUnref<SkMemoryStream> stream(new SkMemoryStream(data));

    /* Allow purgeable iff we own the FD, i.e., in the puregeable and