commit | ce171998009e1abcb0c718c0aee495fcd33645e2 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Mon May 19 11:03:42 2014 -0700 |
committer | Robert Shih <robertshih@google.com> | Mon May 19 11:32:42 2014 -0700 |
tree | a51b04d1a8a934315e4ef4acdffdeeedba2f621d | |
parent | c389ca420d3df05dedcdcfb12b7e7543df837f0d [diff] |
MPEG4Extractor: guard against missing stbl. Bug: 14320131 Change-Id: I33f65117c9c5365bddd96bb41cc4379a0c7ebcbd
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; }