maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pos-crash-fix' of git://github.com/dezgeg/nix

Browse source
This commit is contained in:
Shea Levy 2018-04-23 08:43:54 -04:00
commit e2b028353b
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
3 changed files with 3 additions and 1 deletions
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