diff options
| author | Marco Nelissen <marcone@google.com> | 2016-01-12 22:58:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-12 22:58:08 +0000 |
| commit | a8ac8f617b2df8f07935d3e1e47189dee2381b88 (patch) | |
| tree | fa8f26727c395e361b2db610988cdcb6fbdc3c5e /media | |
| parent | 5b7c20dd1ee9eff7f96676cec68d4b74e33440e7 (diff) | |
| parent | e6bd186c7e2a3b948fdd27a4b71048ee85229e7c (diff) | |
| download | frameworks_av-a8ac8f617b2df8f07935d3e1e47189dee2381b88.zip frameworks_av-a8ac8f617b2df8f07935d3e1e47189dee2381b88.tar.gz frameworks_av-a8ac8f617b2df8f07935d3e1e47189dee2381b88.tar.bz2 | |
Fix out-of-bounds write am: 5403587a74 am: fb2eb86102
am: e6bd186c7e
* commit 'e6bd186c7e2a3b948fdd27a4b71048ee85229e7c':
Fix out-of-bounds write
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 4c9b458..433941c 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -4294,7 +4294,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; |