commit 378445adb9b827b7ecb9ae6527df00f3e1ea8dfe
author Pawin Vongmasa <pawin@google.com> Thu Oct 13 01:06:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 01:06:15 2016 +0000
tree 2dfb91352f0eb22d987305f684c55cb03e0d6411
parent 72eb787809a3dc8128e80766743574f647d21603
parent 441b53063f947cba92871244371a70f700a9c232

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

Change-Id: I59ffede80483146bdd734d7780bd8b9bdbee49fc

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 0395c77..1e3dbcb 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)) {