| commit | 34c27d5db5eff9d4a7df525433ec1c8339892627 | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Tue Jan 04 20:48:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 04 20:48:56 2022 +0000 |
| tree | fc99ff64844e7b0490124f2c8e296357de102a90 | |
| parent | e3a4e442fbfd9e86bd1bcf0a3a5b378a1fead382 [diff] | |
| parent | 7bbe7b4e8b4a0e6a5141eb59a923e5902094c732 [diff] |
lz4diff: Check array bounds prior to access am: 4203702caa am: 06c67e0935 am: 7bbe7b4e8b Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1936320 Change-Id: I462a1f8abd311bb819837a674d3f8f4b41968154
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++; } }