commit 441b53063f947cba92871244371a70f700a9c232
author Pawin Vongmasa <pawin@google.com> Thu Oct 13 00:59:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 00:59:45 2016 +0000
tree 6f03f44be7a25e72b2c74c073c3406f3713fb640
parent 364c0c37425a75d95b4cf6b81ad7fa1994ce9788
parent fd9cc97d4dfe2a2fbce2c0f1704d7a27ce7cbc44

MPEG4Extractor: Check mLastTrack before parsing btrt box.
am: fd9cc97d4d

Change-Id: I85a17cebc6613d27e4f327f4ac82654f62098cdb

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 70a294c..53de82a 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1825,6 +1825,9 @@
         case FOURCC('b', 't', 'r', 't'):
         {
             *offset += chunk_size;
+            if (mLastTrack == NULL) {
+                return ERROR_MALFORMED;
+            }
 
             uint8_t buffer[12];
             if (chunk_data_size != sizeof(buffer)) {