diff options
| author | Marco Nelissen <marcone@google.com> | 2015-04-09 15:15:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 15:15:59 +0000 |
| commit | f5e633989263f03c469d676246fbf003f3bb1acc (patch) | |
| tree | ccf824296d111649d42cebb068d30041b830012e | |
| parent | e5eda367571db5894024d0d71e3831484ef53141 (diff) | |
| parent | 65b351c9e6b2de28d9517d90c42965d0fb3c5cd6 (diff) | |
| download | frameworks_av-f5e633989263f03c469d676246fbf003f3bb1acc.zip frameworks_av-f5e633989263f03c469d676246fbf003f3bb1acc.tar.gz frameworks_av-f5e633989263f03c469d676246fbf003f3bb1acc.tar.bz2 | |
am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"
* commit '65b351c9e6b2de28d9517d90c42965d0fb3c5cd6':
Fix div zero error in corrupted media file
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 8bf7f63..3dd8b11 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1172,6 +1172,11 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { return ERROR_IO; } + if (!timescale) { + ALOGE("timescale should not be ZERO."); + return ERROR_MALFORMED; + } + mLastTrack->timescale = ntohl(timescale); // 14496-12 says all ones means indeterminate, but some files seem to use @@ -2636,6 +2641,11 @@ status_t MPEG4Extractor::verifyTrack(Track *track) { return ERROR_MALFORMED; } + if (track->timescale == 0) { + ALOGE("timescale invalid."); + return ERROR_MALFORMED; + } + return OK; } |