diff options
| author | Robert Shih <robertshih@google.com> | 2014-12-17 17:06:37 -0800 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2014-12-17 17:09:47 -0800 |
| commit | 1391f933b49cfb56da9aa63f723de83b076cf888 (patch) | |
| tree | 3c6b03cc66cb484787baf322482214a4e1a32e13 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | e48cf5b8f823c30af93577c1e380d752ac69b871 (diff) | |
| download | frameworks_av-1391f933b49cfb56da9aa63f723de83b076cf888.zip frameworks_av-1391f933b49cfb56da9aa63f723de83b076cf888.tar.gz frameworks_av-1391f933b49cfb56da9aa63f723de83b076cf888.tar.bz2 | |
MPEG4Extractor: null check in MPEG4Source::parseChunk
Bug: 18771789
Change-Id: Ic12bf565be23eba39b49930c7ce43372fce4f826
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)) { |