commit fd9cc97d4dfe2a2fbce2c0f1704d7a27ce7cbc44
author Pawin Vongmasa <pawin@google.com> Fri Sep 30 00:58:32 2016 -0700
committer Pawin Vongmasa <pawin@google.com> Fri Sep 30 16:37:13 2016 -0700
tree 9d88a3915bdef53ee8dc94c5f9fff6b8e38c7827
parent 20d7cfb6d9c7ef58ac0c007c0b61d39b46036781

MPEG4Extractor: Check mLastTrack before parsing btrt box.

Bug: 31449945
Change-Id: I3380d494a57bb81f1a7455c64c3ab78da12c382d

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 6a67fcf..77e7968 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1767,6 +1767,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)) {