From: totph <39962140+totph@users.noreply.github.com>
Date: Mon, 14 Oct 2019 18:28:19 +0000 (+0200)
Subject: Fix an out-of-bounds read when logging (#475)
X-Git-Tag: v4.0~751
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4ce4bad2c6cf03358f0d7632b7f6f95d3326c59;p=thirdparty%2Fccache.git

Fix an out-of-bounds read when logging (#475)

The stack variable `suffix` is not guaranteed to be zero-terminated.
---

diff --git a/src/result.cpp b/src/result.cpp
index 15b0a18c2..e5b95727e 100644
--- a/src/result.cpp
+++ b/src/result.cpp
@@ -126,19 +126,19 @@ read_embedded_file_entry(CacheEntryReader& reader,
   reader.read(file_len);
 
   bool content_read = false;
+  std::string suffix_str(suffix, suffix_len);
   if (dump_stream) {
     fmt::print(dump_stream,
                "Embedded file #{}: {} ({} bytes)\n",
                entry_number,
-               suffix,
+               suffix_str,
                file_len);
   } else {
     cc_log("Retrieving embedded file #%u %s (%llu bytes)",
            entry_number,
-           suffix,
+           suffix_str.c_str(),
            (unsigned long long)file_len);
 
-    std::string suffix_str(suffix, suffix_len);
     const auto it = result_file_map->find(suffix_str);
     if (it != result_file_map->end()) {
       content_read = true;
@@ -226,16 +226,17 @@ read_raw_file_entry(CacheEntryReader& reader,
   uint64_t file_len;
   reader.read(file_len);
 
+  std::string suffix_str(suffix, suffix_len);
   if (dump_stream) {
     fmt::print(dump_stream,
                "Raw file #{}: {} ({} bytes)\n",
                entry_number,
-               suffix,
+               suffix_str,
                file_len);
   } else {
     cc_log("Retrieving raw file #%u %s (%llu bytes)",
            entry_number,
-           suffix,
+           suffix_str.c_str(),
            (unsigned long long)file_len);
 
     auto raw_path = get_raw_file_path(result_path_in_cache, entry_number);
@@ -252,7 +253,6 @@ read_raw_file_entry(CacheEntryReader& reader,
                     file_len));
     }
 
-    std::string suffix_str(suffix, suffix_len);
     const auto it = result_file_map->find(suffix_str);
     if (it != result_file_map->end()) {
       const auto& dest_path = it->second;