commit 90b26ed8c9a49e41371c5c1aec817e759ee0ad0f
author Pawin Vongmasa <pawin@google.com> Thu Oct 13 01:06:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 01:06:36 2016 +0000
tree 28d06edbedeb26edb32f5c0a865894decece91b7
parent b7dc6d23ecbeed8cf14f1b7f56ed36f76f495703
parent 7ea893f684081253bbc7ff361d091aeeef8732ef

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

Change-Id: I3251216e254952e7ef044a4cbe0b43b746aa4b7c

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 7a818ec..c8ca36c 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1824,6 +1824,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)) {