| commit | 726b9eb55cdb9b817ca2b63d72862fba2dcd0dfb | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Thu May 26 15:40:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 26 15:40:08 2022 +0000 |
| tree | 5d5c6d0b79d39301885f1a87037e6cc8e015d9d3 | |
| parent | 616bd340ecded759720199bcf5b8562e0fdf3f59 [diff] | |
| parent | e2a8a1e3177bc87b5f969246b038a512490843be [diff] |
Avoid read out of bounds am: 9d33304ec7 am: e2a8a1e317 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18492389 Change-Id: Ic5a5f69405361f0b75107b88b31ec317d42f1194 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