diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-04 23:34:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-04 23:34:25 +0000 |
commit | 0805add748f6857cb7537a1e16562f59dc96e334 (patch) | |
tree | 62c52e5ff020c3ebb6b431cb482a018514cb1a55 /media | |
parent | d2d16b937d66e2ce031d018d8cf8072914cd56ec (diff) | |
parent | 7d681539b821664d0417f8dd6beaed3352b34787 (diff) | |
download | frameworks_av-0805add748f6857cb7537a1e16562f59dc96e334.zip frameworks_av-0805add748f6857cb7537a1e16562f59dc96e334.tar.gz frameworks_av-0805add748f6857cb7537a1e16562f59dc96e334.tar.bz2 |
Merge "Guard against codecinfo overflow" into mnc-dev
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/MetaData.cpp | 7 | ||||
-rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 15 |
2 files changed, 20 insertions, 2 deletions
diff --git a/media/libstagefright/MetaData.cpp b/media/libstagefright/MetaData.cpp index 74234a6..7d867b7 100644 --- a/media/libstagefright/MetaData.cpp +++ b/media/libstagefright/MetaData.cpp @@ -272,7 +272,12 @@ void MetaData::typed_data::setData( mType = type; allocateStorage(size); - memcpy(storage(), data, size); + void *dst = storage(); + if (!dst) { + ALOGE("Couldn't allocate %zu bytes for item", size); + return; + } + memcpy(dst, data, size); } void MetaData::typed_data::getData( diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index e8bd432..ecc2573 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -871,25 +871,38 @@ status_t addVorbisCodecInfo( size_t offset = 1; size_t len1 = 0; while (offset < codecPrivateSize && codecPrivate[offset] == 0xff) { + if (len1 > (SIZE_MAX - 0xff)) { + return ERROR_MALFORMED; // would overflow + } len1 += 0xff; ++offset; } if (offset >= codecPrivateSize) { return ERROR_MALFORMED; } + if (len1 > (SIZE_MAX - codecPrivate[offset])) { + return ERROR_MALFORMED; // would overflow + } len1 += codecPrivate[offset++]; size_t len2 = 0; while (offset < codecPrivateSize && codecPrivate[offset] == 0xff) { + if (len2 > (SIZE_MAX - 0xff)) { + return ERROR_MALFORMED; // would overflow + } len2 += 0xff; ++offset; } if (offset >= codecPrivateSize) { return ERROR_MALFORMED; } + if (len2 > (SIZE_MAX - codecPrivate[offset])) { + return ERROR_MALFORMED; // would overflow + } len2 += codecPrivate[offset++]; - if (codecPrivateSize < offset + len1 + len2) { + if (len1 > SIZE_MAX - len2 || offset > SIZE_MAX - (len1 + len2) || + codecPrivateSize < offset + len1 + len2) { return ERROR_MALFORMED; } |