lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #5976 from edolstra/read-invalid-paths

Browse source 
Allow builtins.{readFile,path} on invalid paths
This commit is contained in:
Eelco Dolstra 2022-01-25 00:04:01 +01:00 committed by GitHub
parent e66550c917 8cbbaf23e8
commit 716a08827e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libexpr/primops.cc
View file

@ -1445,9 +1445,13 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
string s = readFile(path); string s = readFile(path);
if (s.find((char) 0) != string::npos) if (s.find((char) 0) != string::npos)
throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path); throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path);
auto refs = state.store->isInStore(path) ? StorePathSet refs;
state.store->queryPathInfo(state.store->toStorePath(path).first)->references : if (state.store->isInStore(path)) {
StorePathSet{}; try {
refs = state.store->queryPathInfo(state.store->toStorePath(path).first)->references;
} catch (Error &) { // FIXME: should be InvalidPathError
}
}
auto context = state.store->printStorePathSet(refs); auto context = state.store->printStorePathSet(refs);
v.mkString(s, context); v.mkString(s, context);
} }
@ -1866,10 +1870,13 @@ static void addPath(
StorePathSet refs; StorePathSet refs;
if (state.store->isInStore(path)) { if (state.store->isInStore(path)) {
auto [storePath, subPath] = state.store->toStorePath(path); try {
// FIXME: we should scanForReferences on the path before adding it auto [storePath, subPath] = state.store->toStorePath(path);
refs = state.store->queryPathInfo(storePath)->references; // FIXME: we should scanForReferences on the path before adding it
path = state.store->toRealPath(storePath) + subPath; refs = state.store->queryPathInfo(storePath)->references;
path = state.store->toRealPath(storePath) + subPath;
} catch (Error &) { // FIXME: should be InvalidPathError
}
} }
path = evalSettings.pureEval && expectedHash path = evalSettings.pureEval && expectedHash