diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-03 20:21:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 20:21:05 +0000 |
commit | 0bde48f53c285780c1e95fa55bcc7e46f8730320 (patch) | |
tree | 37c909dfc352e5b30fe208834bff1c5edba816cc /media | |
parent | 36d73eab51912060b3159c5ddacdd96bf636260f (diff) | |
parent | 99a1a6a79ca14554d2951101008348a9e2acbb8c (diff) | |
download | frameworks_av-0bde48f53c285780c1e95fa55bcc7e46f8730320.zip frameworks_av-0bde48f53c285780c1e95fa55bcc7e46f8730320.tar.gz frameworks_av-0bde48f53c285780c1e95fa55bcc7e46f8730320.tar.bz2 |
am 99a1a6a7: am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow
* commit '99a1a6a79ca14554d2951101008348a9e2acbb8c':
Guard against codecinfo overflow
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 2587ec7..bca1bae 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -875,25 +875,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; } |