From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 17 Nov 2021 15:47:41 +0000 (+0100)
Subject: fix: Correct entry_size field for result entries
X-Git-Tag: v4.6~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a165e7d94443e0a2e4c2f83c1411ddee980bc64;p=thirdparty%2Fccache.git

fix: Correct entry_size field for result entries

The entry_size field in result entries created by ccache 4.5 are off by
one. Fix this by properly accounting for the new format_ver field in
result payload data.

Note: This bug only affects the recompression feature (-X/--recompress)
and not other ccache usage.

Closes #965.
---

diff --git a/src/Result.cpp b/src/Result.cpp
index b36cd231b..22dfc0e40 100644
--- a/src/Result.cpp
+++ b/src/Result.cpp
@@ -325,6 +325,7 @@ Writer::do_finalize()
 {
   FileSizeAndCountDiff file_size_and_count_diff{0, 0};
   uint64_t payload_size = 0;
+  payload_size += 1; // format_ver
   payload_size += 1; // n_entries
   for (const auto& pair : m_entries_to_write) {
     const auto& path = pair.second;