diff options
| author | Robert Shih <robertshih@google.com> | 2014-12-19 17:24:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-19 17:24:03 +0000 |
| commit | 9dcc312a98288b5456d3322d8393cc25c795032c (patch) | |
| tree | 3c6b03cc66cb484787baf322482214a4e1a32e13 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 562b98ec7edf9303f4c7d8da7e81171b621d3849 (diff) | |
| parent | 1391f933b49cfb56da9aa63f723de83b076cf888 (diff) | |
| download | frameworks_av-9dcc312a98288b5456d3322d8393cc25c795032c.zip frameworks_av-9dcc312a98288b5456d3322d8393cc25c795032c.tar.gz frameworks_av-9dcc312a98288b5456d3322d8393cc25c795032c.tar.bz2 | |
am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunk
* commit '1391f933b49cfb56da9aa63f723de83b076cf888':
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 d922dc0..2eb7e5c 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)) { |