From aa6d0c92facbadf40cdadd58ef2df15d16925af9 Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Thu, 15 May 2025 19:47:20 +0800
Subject: [PATCH] android: ensure image round down to at least 1 block

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 system/update_engine/payload_generator/generate_delta_main.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/update_engine/payload_generator/generate_delta_main.cc b/system/update_engine/payload_generator/generate_delta_main.cc
index 6861705b58e..66d763c9602 100644
--- a/system/update_engine/payload_generator/generate_delta_main.cc
+++ b/system/update_engine/payload_generator/generate_delta_main.cc
@@ -465,8 +465,9 @@ void RoundDownPartitions(const ImageConfig& config) {
     if (part.path.empty()) {
       continue;
     }
-    const auto size = std::max<size_t>(utils::FileSize(part.path), kBlockSize);
+    auto size = utils::FileSize(part.path);
     if (size % kBlockSize != 0) {
+      size = std::max<size_t>(size, kBlockSize);
       const auto err =
           truncate(part.path.c_str(), size / kBlockSize * kBlockSize);
       CHECK_EQ(err, 0) << "Failed to truncate " << part.path << ", error "