commit ae84e20b2a0cb77223d40f55c71011d3ae8c71c7
author Marco Nelissen <marcone@google.com> Thu May 01 15:35:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 15:35:31 2014 +0000
tree 55a2c2fa46068e759b7cde789442fc3fe0b3e2cc
parent 2c4e44b3749af379902b850c99915f3152fc35ca
parent 4375e84882a9a84b0012cf9504a30ede6ef72c1f

am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.

media/jni/android_media_MediaMetadataRetriever.cpp

diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp
index 4e42ae3..157dd49 100644
--- a/media/jni/android_media_MediaMetadataRetriever.cpp
+++ b/media/jni/android_media_MediaMetadataRetriever.cpp
@@ -273,6 +273,13 @@
                             width,
                             height,
                             config);
+    if (jBitmap == NULL) {
+        if (env->ExceptionCheck()) {
+            env->ExceptionClear();
+        }
+        ALOGE("getFrameAtTime: create Bitmap failed!");
+        return NULL;
+    }
 
     SkBitmap *bitmap =
             (SkBitmap *) env->GetLongField(jBitmap, fields.nativeBitmap);