diff options
| author | Robert Shih <robertshih@google.com> | 2014-12-19 17:32:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-19 17:32:32 +0000 |
| commit | fd923e98c0f63c67fa8972dcc733951b9aa85da1 (patch) | |
| tree | 65e76c4c91cd935eda9658c15b89622ca0e2c996 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 11d4398d1a744c6a6de1eb2a71e287a43f65a881 (diff) | |
| parent | 9dcc312a98288b5456d3322d8393cc25c795032c (diff) | |
| download | frameworks_av-fd923e98c0f63c67fa8972dcc733951b9aa85da1.zip frameworks_av-fd923e98c0f63c67fa8972dcc733951b9aa85da1.tar.gz frameworks_av-fd923e98c0f63c67fa8972dcc733951b9aa85da1.tar.bz2 | |
am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunk
* commit '9dcc312a98288b5456d3322d8393cc25c795032c':
MPEG4Extractor: null check in MPEG4Source::parseChunk
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 64ab2f7..dec52f3 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -999,6 +999,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { int64_t duration; int32_t samplerate; + if (!mLastTrack) { + return ERROR_MALFORMED; + } if (mLastTrack->meta->findInt64(kKeyDuration, &duration) && mLastTrack->meta->findInt32(kKeySampleRate, &samplerate)) { |