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

readFile: Check against nul bytes

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-01 15:07:42 +02:00
parent feca5cb67f
commit 1c88e100e7
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/primops.cc
View file

@ -749,7 +749,10 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
throw EvalError(format("cannot read ‘%1%’, since path ‘%2%’ is not valid, at %3%") throw EvalError(format("cannot read ‘%1%’, since path ‘%2%’ is not valid, at %3%")
% path % e.path % pos); % path % e.path % pos);
} }
mkString(v, readFile(state.checkSourcePath(path)).c_str()); string s = readFile(state.checkSourcePath(path));
if (s.find((char) 0) != string::npos)
throw Error(format("the contents of the file ‘%1%’ cannot be represented as a Nix string") % path);
mkString(v, s.c_str());
} }