| commit | 64c496c8d51c71605cd34a510da2ecd8180656ec | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jan 23 19:54:44 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 23 19:54:44 2015 +0000 |
| tree | 7fb64dfadc976e6f489f6fba2280643f6a0bae47 | |
| parent | ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076 [diff] | |
| parent | ea9f215a13f1a5e6455be91624a81a024641a26d [diff] |
Merge "Fix MTP delete" into lmp-mr1-dev
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 2eb7e5c..be3bc4a 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1144,7 +1144,7 @@ { *offset += chunk_size; - if (chunk_data_size < 4) { + if (chunk_data_size < 4 || mLastTrack == NULL) { return ERROR_MALFORMED; }