| commit | 0fc277dbb3ad9b12b9fdf73cdedf3119088946f1 | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Thu May 26 16:06:27 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 26 16:06:27 2022 +0000 |
| tree | 281db04f4932083a4a57d8f9d963c5c9134f54a9 | |
| parent | f2a31ecf896bccc0a517265a08f3e85be5de0e01 [diff] | |
| parent | 726b9eb55cdb9b817ca2b63d72862fba2dcd0dfb [diff] |
Avoid read out of bounds am: 9d33304ec7 am: e2a8a1e317 am: 726b9eb55c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18492389 Change-Id: I1dc3a7324859e8809d8555dc4d375f477a7017bf 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 f157d35..78e3f00 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -4573,7 +4573,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; } // formerly kKeyVorbisInfo