| commit | 202fbed96db40ec5fb43d633fc97601a15a6dd7a | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Wed Jan 21 09:52:08 2015 -0800 |
| committer | Robert Shih <robertshih@google.com> | Wed Jan 21 09:52:08 2015 -0800 |
| tree | 8a6417f140330b76626dcaa23a256ce4af7c6c91 | |
| parent | 0a10eed0c3f3bee14a7d28302af33f8b749ee4ff [diff] |
MPEG4Extractor: more NULL derefernce fixes in parseChunk Bug: 18771789 Change-Id: Ie0511ed3a885dbf64a7472e8fa74d15b0e87778d
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; }