diff options
| author | Robert Shih <robertshih@google.com> | 2015-01-23 19:42:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-23 19:42:13 +0000 |
| commit | ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076 (patch) | |
| tree | e235ad7d64ba52e40da6469b23a7dd93dcd9bf1e /media | |
| parent | c0c2366c180e06f03cbd1c1a4020bdc26f1002f7 (diff) | |
| parent | 202fbed96db40ec5fb43d633fc97601a15a6dd7a (diff) | |
| download | frameworks_av-ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076.zip frameworks_av-ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076.tar.gz frameworks_av-ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076.tar.bz2 | |
Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { { *offset += chunk_size; - if (chunk_data_size < 4) { + if (chunk_data_size < 4 || mLastTrack == NULL) { return ERROR_MALFORMED; } |