diff options
| author | Wei Jia <wjia@google.com> | 2015-06-05 16:14:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 16:14:27 +0000 |
| commit | 86174e2c09986b2d2ebcaf95a4a3e614bcf134ef (patch) | |
| tree | 11e68281c4c32d53b02b48ecfd24bd22202f87ac | |
| parent | 4d8ed149894eff1e21195a29d939f2ec389fe5d7 (diff) | |
| parent | d89104a3d5a16298742110bff1d10b43d16fef7b (diff) | |
| download | frameworks_av-86174e2c09986b2d2ebcaf95a4a3e614bcf134ef.zip frameworks_av-86174e2c09986b2d2ebcaf95a4a3e614bcf134ef.tar.gz frameworks_av-86174e2c09986b2d2ebcaf95a4a3e614bcf134ef.tar.bz2 | |
Merge "Prevent reading past the end of the buffer in 3GPP" into lmp-dev
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index e74d9a6..053bfbf 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -2395,11 +2395,11 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) { } status_t MPEG4Extractor::parse3GPPMetaData(off64_t offset, size_t size, int depth) { - if (size < 4) { + if (size < 4 || size == SIZE_MAX) { return ERROR_MALFORMED; } - uint8_t *buffer = new (std::nothrow) uint8_t[size]; + uint8_t *buffer = new (std::nothrow) uint8_t[size + 1]; if (buffer == NULL) { return ERROR_MALFORMED; } @@ -2495,6 +2495,7 @@ status_t MPEG4Extractor::parse3GPPMetaData(off64_t offset, size_t size, int dept } if (isUTF8) { + buffer[size] = 0; mFileMetaData->setCString(metadataKey, (const char *)buffer + 6); } else { // Convert from UTF-16 string to UTF-8 string. |