From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 3 Nov 2025 20:11:32 +0000 (+0100)
Subject: fix: Be robust against filesystem path encoding problems on Windows
X-Git-Tag: v4.13~81
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=81f0eecdaea451fda1ee51a9fac96fcc34ddf392;p=thirdparty%2Fccache.git

fix: Be robust against filesystem path encoding problems on Windows
---

diff --git a/src/ccache/ccache.cpp b/src/ccache/ccache.cpp
index c8cc6775..e48b5411 100644
--- a/src/ccache/ccache.cpp
+++ b/src/ccache/ccache.cpp
@@ -631,11 +631,17 @@ process_preprocessed_file(Context& ctx, Hash& hash, const fs::path& path)
       while (!inc_path.empty() && inc_path.back() == '/') {
         inc_path.pop_back();
       }
+      fs::path inc_fs_path;
+      try {
+        inc_fs_path = inc_path;
+      } catch (const std::filesystem::filesystem_error&) {
+        return tl::unexpected(Failure(Statistic::unsupported_source_encoding));
+      }
       if (!ctx.config.base_dirs().empty()) {
         auto it = relative_inc_path_cache.find(inc_path);
         if (it == relative_inc_path_cache.end()) {
           std::string rel_inc_path =
-            util::pstr(core::make_relative_path(ctx, inc_path));
+            util::pstr(core::make_relative_path(ctx, inc_fs_path));
           relative_inc_path_cache.emplace(inc_path, rel_inc_path);
           inc_path = util::pstr(rel_inc_path);
         } else {
@@ -643,11 +649,11 @@ process_preprocessed_file(Context& ctx, Hash& hash, const fs::path& path)
         }
       }
 
-      if (inc_path != ctx.apparent_cwd || ctx.config.hash_dir()) {
-        hash.hash(inc_path);
+      if (inc_fs_path != ctx.apparent_cwd || ctx.config.hash_dir()) {
+        hash.hash(inc_fs_path);
       }
 
-      TRY(remember_include_file(ctx, inc_path, hash, system, nullptr));
+      TRY(remember_include_file(ctx, inc_fs_path, hash, system, nullptr));
       p = q; // Everything of interest between p and q has been hashed now.
     } else if (strncmp(q, incbin_directive, sizeof(incbin_directive)) == 0
                && ((q[7] == ' '