commit cc19c8b58a48a0d090ea9d9897664f9817e7bac1
author Robert Shih <robertshih@google.com> Mon Jun 02 17:38:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 02 17:38:00 2014 +0000
tree 6500110292965525285966314ea8651c46989b4d
parent d28148537693b19320f3c3b5b34816d45542e9bd
parent ce171998009e1abcb0c718c0aee495fcd33645e2

Merge "MPEG4Extractor: guard against missing stbl."

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index e07b6aa..05caf75 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2460,8 +2460,9 @@
         }
     }
 
-    if (!track->sampleTable->isValid()) {
+    if (track->sampleTable == NULL || !track->sampleTable->isValid()) {
         // Make sure we have all the metadata we need.
+        ALOGE("stbl atom missing/invalid.");
         return ERROR_MALFORMED;
     }