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