diff options
| author | Marco Nelissen <marcone@google.com> | 2016-01-12 12:37:36 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-01-22 13:36:16 -0800 |
| commit | d7640491ba0cf2ef8424734a942f38f80535591b (patch) | |
| tree | 1f580e41c5669a809a5eb7fa4fc0b7aa63b50a7c /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 349169847c86cd1154a3b401d4cab6f0a410b192 (diff) | |
| download | frameworks_av-d7640491ba0cf2ef8424734a942f38f80535591b.zip frameworks_av-d7640491ba0cf2ef8424734a942f38f80535591b.tar.gz frameworks_av-d7640491ba0cf2ef8424734a942f38f80535591b.tar.bz2 | |
Fix out-of-bounds write
Bug: 26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index bfdff38..e4f8384 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -4545,7 +4545,15 @@ status_t MPEG4Source::fragmentedRead( continue; } - CHECK(dstOffset + 4 <= mBuffer->size()); + if (dstOffset > SIZE_MAX - 4 || + dstOffset + 4 > SIZE_MAX - nalLength || + dstOffset + 4 + nalLength > mBuffer->size()) { + ALOGE("b/26365349 : %zu %zu", dstOffset, mBuffer->size()); + android_errorWriteLog(0x534e4554, "26365349"); + mBuffer->release(); + mBuffer = NULL; + return ERROR_MALFORMED; + } dstData[dstOffset++] = 0; dstData[dstOffset++] = 0; |