diff options
| author | Robert Shih <robertshih@google.com> | 2015-01-21 09:52:08 -0800 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2015-01-21 09:52:08 -0800 |
| commit | 202fbed96db40ec5fb43d633fc97601a15a6dd7a (patch) | |
| tree | 8a6417f140330b76626dcaa23a256ce4af7c6c91 | |
| parent | 0a10eed0c3f3bee14a7d28302af33f8b749ee4ff (diff) | |
| download | frameworks_av-202fbed96db40ec5fb43d633fc97601a15a6dd7a.zip frameworks_av-202fbed96db40ec5fb43d633fc97601a15a6dd7a.tar.gz frameworks_av-202fbed96db40ec5fb43d633fc97601a15a6dd7a.tar.bz2 | |
MPEG4Extractor: more NULL derefernce fixes in parseChunk
Bug: 18771789
Change-Id: Ie0511ed3a885dbf64a7472e8fa74d15b0e87778d
| -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; } |