| commit | a8ab3184ffb463e86c038bf0d387a6ec78fc9ca9 | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Thu May 26 17:12:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 26 17:12:05 2022 +0000 |
| tree | e3200a34cf2368e5463ad83cfb05543d78edaceb | |
| parent | 940b7ba705d08b977e99a05bc56514ff4acad401 [diff] | |
| parent | b2c01cbbc6b66bd7c448c0f1f3cb86ea6c7f2c05 [diff] |
Avoid read out of bounds am: 9d33304ec7 am: e2a8a1e317 am: 726b9eb55c am: 0fc277dbb3 am: b2c01cbbc6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18492389 Change-Id: Ia7a69efb2efffabac358ed6bbce1e5c8ff098ea7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }