diff options
| author | Robert Shih <robertshih@google.com> | 2015-01-23 20:57:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 20:57:27 +0000 |
| commit | 882ffba6a98dbe97a07f094ce87d9b81b756971e (patch) | |
| tree | da133dfcbbc5e049db56c75884686f1dd9503d3c | |
| parent | 40a0ac3aba5ff8fc44e51ba4f7b0bac3448818c9 (diff) | |
| parent | d8aff827c3c7d1396b624b1462c81e415ef3c160 (diff) | |
| download | frameworks_av-882ffba6a98dbe97a07f094ce87d9b81b756971e.zip frameworks_av-882ffba6a98dbe97a07f094ce87d9b81b756971e.tar.gz frameworks_av-882ffba6a98dbe97a07f094ce87d9b81b756971e.tar.bz2 | |
am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev
* commit 'd8aff827c3c7d1396b624b1462c81e415ef3c160':
MPEG4Extractor: more NULL derefernce fixes in parseChunk
do not use paused postition if it's not available
Use aligned width and height to compute size.
| -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 dec52f3..8bf7f63 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; } |