diff options
| author | Wei Jia <wjia@google.com> | 2015-06-05 17:43:52 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-06-05 17:43:52 -0700 |
| commit | 115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0 (patch) | |
| tree | 72ae084b486e49065520332b3a43ff4c3a3f75ef | |
| parent | 768a8fb4c05f524c802f8e97c9e07b73d1a196ff (diff) | |
| parent | 1f44d837a9273dc86bf0c928c2ead313d71d1464 (diff) | |
| download | frameworks_av-115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0.zip frameworks_av-115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0.tar.gz frameworks_av-115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0.tar.bz2 | |
resolved conflicts for merge of 1f44d837 to lmp-dev
Change-Id: Id60c2470ec2afebdbc1c0c995b90e294c9c879eb
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 5a86aac..00af00b 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1890,6 +1890,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { size = 0; } + if (SIZE_MAX - chunk_size <= size) { + return ERROR_MALFORMED; + } + uint8_t *buffer = new (std::nothrow) uint8_t[size + chunk_size]; if (buffer == NULL) { return ERROR_MALFORMED; |