commit ab962b54e3eac4ffadb5ea4e4948df10e6201468
author Marco Nelissen <marcone@google.com> Thu May 01 15:28:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 15:28:14 2014 +0000
tree 33f5801e9c796a39a277fd93fef38b28b608fc27
parent 5dca099df7100c531e111b50435605c318f1e6d4
parent ab3977d21161815c130bdedf21e2571382d208da

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

* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  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 6176f0f..c2694f1 100644
--- a/media/jni/android_media_MediaMetadataRetriever.cpp
+++ b/media/jni/android_media_MediaMetadataRetriever.cpp
@@ -262,6 +262,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);