Fix long path handling for project store

1 files changed, 8 insertions, 3 deletions

diff --git a/src/zenserver/storage/projectstore/httpprojectstore.cpp b/src/zenserver/storage/projectstore/httpprojectstore.cpp
index 38a121b37..3bde082e5 100644
--- a/src/zenserver/storage/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/storage/projectstore/httpprojectstore.cpp
@@ -3161,8 +3161,10 @@ HttpProjectService::HandleRpcRequest(HttpRouterRequest& Req)
 										continue;
 									}
 
-									std::error_code				Ec;
-									const std::filesystem::path FilePath = std::filesystem::canonical(Project->RootDir / ServerPath, Ec);
+									std::error_code Ec;
+									// Long paths require MakeSafeAbsolutePath otherwise canonical will yield an error code
+									const std::filesystem::path FilePath =
+										std::filesystem::canonical(MakeSafeAbsolutePath(Project->RootDir / ServerPath), Ec);
 
 									if (Ec)
 									{
@@ -3183,7 +3185,10 @@ HttpProjectService::HandleRpcRequest(HttpRouterRequest& Req)
 									}
 
 									BasicFile DataFile;
-									DataFile.Open(FilePath, BasicFile::Mode::kRead, Ec);
+									// Even after calling MakeSafeAbsolutePath on the input to canonical, we will fail to read
+									// long paths for the output of canonical unless we make them safe here again, because the
+									// output of canonical will have stripped things like the leading characters to handle long paths
+									DataFile.Open(MakeSafeAbsolutePath(FilePath), BasicFile::Mode::kRead, Ec);
 
 									if (Ec)
 									{