diff options
| author | Marco Nelissen <marcone@google.com> | 2016-01-12 12:37:36 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2016-01-12 12:37:36 -0800 |
| commit | 5403587a74aee2fb57076528c3927851531c8afb (patch) | |
| tree | 630f36eda2cf59c2fbc020e68f36cb23ac893b7c /media | |
| parent | 9e29523b9537983b4c4b205ff868d0b3bca0383b (diff) | |
| download | frameworks_av-5403587a74aee2fb57076528c3927851531c8afb.zip frameworks_av-5403587a74aee2fb57076528c3927851531c8afb.tar.gz frameworks_av-5403587a74aee2fb57076528c3927851531c8afb.tar.bz2 | |
Fix out-of-bounds write
Bug: 26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
Diffstat (limited to 'media')
| -rw-r--r-- | 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 f0988eb..5d8be84 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3682,7 +3682,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; |