From 6851ca2ead1e11fa8653d7529f2d9ff0e76a2c46 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 17 Nov 2021 16:47:41 +0100
Subject: [PATCH] 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.

(cherry picked from commit 1a165e7d94443e0a2e4c2f83c1411ddee980bc64)
---
 src/Result.cpp | 1 +
 1 file changed, 1 insertion(+)

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;
-- 
2.47.2