nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 14:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

PosixSourceAccessor::cachedLstat(): Use absolute path

Browse Source 
Using the relative path can cause collisions between cache entries for
PosixSourceAccessors with different roots.
This commit is contained in:
Eelco Dolstra 2024-03-04 21:54:35 +01:00
parent eaa6c26189
commit 9ee590e113
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libutil/posix-source-accessor.cc
View File

@ -85,16 +85,18 @@ bool PosixSourceAccessor::pathExists(const CanonPath & path)
std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & path) std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & path)
{ {
static Sync<std::unordered_map<CanonPath, std::optional<struct stat>>> _cache; static Sync<std::unordered_map<std::filesystem::path, std::optional<struct stat>>> _cache;
auto absPath = makeAbsPath(path);
{ {
auto cache(_cache.lock()); auto cache(_cache.lock());
auto i = cache->find(path); auto i = cache->find(absPath);
if (i != cache->end()) return i->second; if (i != cache->end()) return i->second;
} }
std::optional<struct stat> st{std::in_place}; std::optional<struct stat> st{std::in_place};
if (::lstat(makeAbsPath(path).c_str(), &*st)) { if (::lstat(absPath.c_str(), &*st)) {
if (errno == ENOENT || errno == ENOTDIR) if (errno == ENOENT || errno == ENOTDIR)
st.reset(); st.reset();
else else
@ -103,7 +105,7 @@ std::optional<struct stat> PosixSourceAccessor::cachedLstat(const CanonPath & pa
auto cache(_cache.lock()); auto cache(_cache.lock());
if (cache->size() >= 16384) cache->clear(); if (cache->size() >= 16384) cache->clear();
cache->emplace(path, st); cache->emplace(absPath, st);
return st; return st;
} }