| commit | 7d0b88264e89318c516e6af44ddbd17f9912f888 | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Sat Jun 11 02:16:43 2022 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Sat Jun 11 02:16:43 2022 +0000 |
| tree | 1bddf2fed73831b5f60aa1363acea873db510449 | |
| parent | faedf2c25d1c1185bf0b8b2df7f82082deb2c20c [diff] | |
| parent | 341636e4bb9ec3735adcea50b0e932505d30daa6 [diff] |
Merge cherrypicks of [18492389] into sc-platform-release. Change-Id: I9a90a9254c66b8a96825a5ba2e9c0e88fb985944
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index 8836c47..65c0238 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -4771,7 +4771,7 @@ if (len2 == 0) { return ERROR_MALFORMED; } - if (offset >= csd_size || csd[offset] != 0x01) { + if (offset + len1 > csd_size || csd[offset] != 0x01) { return ERROR_MALFORMED; }