| commit | 83f70fd95c469635eb91ec191b18ef0e4aa1261c | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Fri Sep 22 23:23:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 23:23:53 2023 +0000 |
| tree | 434e421d3a26cce9146cd7b473a471b51c685f2c | |
| parent | caf897f390eb672022f5d93a0923c5a3f462aa45 [diff] | |
| parent | 66a4b364338a4bf3b259b07394e14eee120f7525 [diff] |
Ensure partitions are at least 1 block in size am: 316e7c01c1 am: 5c4b29f432 am: f37dc1429c am: 66a4b36433 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2759626 Change-Id: Ic7913379f5fa6f5bb92eb89b56b57f633ebefcad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc index 5f0c9d2..9afa805 100644 --- a/payload_generator/generate_delta_main.cc +++ b/payload_generator/generate_delta_main.cc
@@ -470,7 +470,7 @@ if (part.path.empty()) { continue; } - const auto size = utils::FileSize(part.path); + const auto size = std::max<size_t>(utils::FileSize(part.path), kBlockSize); if (size % kBlockSize != 0) { const auto err = truncate(part.path.c_str(), size / kBlockSize * kBlockSize);