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

libexpr: Make unsafeGetAttrPos not crash on noPos

Browse source 
Currently e.g. `builtins.unsafeGetAttrPos "abort" builtins` will
eventually segfault because pos->file is an unset Symbol.

Found by afl-fuzz.
This commit is contained in:
Tuomas Tynkkynen 2018-04-03 15:27:17 +03:00
parent 3fbaa230a2
commit af86132e1a
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -628,7 +628,7 @@ void EvalState::mkThunk_(Value & v, Expr * expr)
void EvalState::mkPos(Value & v, Pos * pos) void EvalState::mkPos(Value & v, Pos * pos)
{ {
if (pos) { if (pos && pos->file.set()) {
mkAttrs(v, 3); mkAttrs(v, 3);
mkString(*allocAttr(v, sFile), pos->file); mkString(*allocAttr(v, sFile), pos->file);
mkInt(*allocAttr(v, sLine), pos->line); mkInt(*allocAttr(v, sLine), pos->line);

1
tests/lang/eval-okay-getattrpos-undefined.exp Normal file
View file

@ -0,0 +1 @@
null

1
tests/lang/eval-okay-getattrpos-undefined.nix Normal file
View file

@ -0,0 +1 @@
builtins.unsafeGetAttrPos "abort" builtins