| commit | 7bbe7b4e8b4a0e6a5141eb59a923e5902094c732 | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Tue Jan 04 20:30:34 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 04 20:30:34 2022 +0000 |
| tree | fc99ff64844e7b0490124f2c8e296357de102a90 | |
| parent | e0ae9f66d7edf963f64c9e525b689974fa66b12b [diff] | |
| parent | 06c67e093508499539c2197dec3a17da9874f97d [diff] |
lz4diff: Check array bounds prior to access am: 4203702caa am: 06c67e0935 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1936320 Change-Id: I8d04e153735e6af8653d98584be7b26e190591f8
diff --git a/lz4diff/lz4diff_compress.cc b/lz4diff/lz4diff_compress.cc index e580c91..67b02de 100644 --- a/lz4diff/lz4diff_compress.cc +++ b/lz4diff/lz4diff_compress.cc
@@ -149,8 +149,8 @@ } size_t inputmargin = 0; if (zero_padding_enabled) { - while (cluster[inputmargin] == 0 && - inputmargin < std::min(kBlockSize, cluster.size())) { + while (inputmargin < std::min(kBlockSize, cluster.size()) && + cluster[inputmargin] == 0) { inputmargin++; } }