mirror of
https://github.com/NixOS/nix
synced 2025-07-12 19:05:08 +02:00
libexpr: Fix invalid handling of errors for imported functions
c39cc00404
has added assertions for
all Value accesses and the following case has started failing with
an `unreachable`:
(/tmp/fun.nix):
```nix
{a}: a
```
```
$ nix eval --impure --expr 'import /tmp/fun.nix {a="a";b="b";}'
```
This would crash:
```
terminating due to unexpected unrecoverable internal error: Unexpected condition in getStorage at ../include/nix/expr/value.hh:844
```
This is not a regression, but rather surfaces an existing problem, which previously
was left undiagnosed. In the case of an import `fun` is the `import` primOp, so that read is invalid
and previously this resulted in an access into an inactive union member, which is UB.
The correct thing to use is `vCur`. Identical problem also affected the case of a missing argument.
Add previously failing test cases to the functional/lang test suite.
Fixes #13448.
This commit is contained in:
parent
a783468333
commit
6e78cc90d3
6 changed files with 33 additions and 2 deletions
|
@ -1602,7 +1602,7 @@ void EvalState::callFunction(Value & fun, std::span<Value *> args, Value & vRes,
|
||||||
symbols[i.name])
|
symbols[i.name])
|
||||||
.atPos(lambda.pos)
|
.atPos(lambda.pos)
|
||||||
.withTrace(pos, "from call site")
|
.withTrace(pos, "from call site")
|
||||||
.withFrame(*fun.lambda().env, lambda)
|
.withFrame(*vCur.lambda().env, lambda)
|
||||||
.debugThrow();
|
.debugThrow();
|
||||||
}
|
}
|
||||||
env2.values[displ++] = i.def->maybeThunk(*this, env2);
|
env2.values[displ++] = i.def->maybeThunk(*this, env2);
|
||||||
|
@ -1629,7 +1629,7 @@ void EvalState::callFunction(Value & fun, std::span<Value *> args, Value & vRes,
|
||||||
.atPos(lambda.pos)
|
.atPos(lambda.pos)
|
||||||
.withTrace(pos, "from call site")
|
.withTrace(pos, "from call site")
|
||||||
.withSuggestions(suggestions)
|
.withSuggestions(suggestions)
|
||||||
.withFrame(*fun.lambda().env, lambda)
|
.withFrame(*vCur.lambda().env, lambda)
|
||||||
.debugThrow();
|
.debugThrow();
|
||||||
}
|
}
|
||||||
unreachable();
|
unreachable();
|
||||||
|
|
12
tests/functional/lang/eval-fail-missing-arg-import.err.exp
Normal file
12
tests/functional/lang/eval-fail-missing-arg-import.err.exp
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
error:
|
||||||
|
… from call site
|
||||||
|
at /pwd/lang/eval-fail-missing-arg-import.nix:1:1:
|
||||||
|
1| import ./non-eval-trivial-lambda-formals.nix { }
|
||||||
|
| ^
|
||||||
|
2|
|
||||||
|
|
||||||
|
error: function 'anonymous lambda' called without required argument 'a'
|
||||||
|
at /pwd/lang/non-eval-trivial-lambda-formals.nix:1:1:
|
||||||
|
1| { a }: a
|
||||||
|
| ^
|
||||||
|
2|
|
1
tests/functional/lang/eval-fail-missing-arg-import.nix
Normal file
1
tests/functional/lang/eval-fail-missing-arg-import.nix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
import ./non-eval-trivial-lambda-formals.nix { }
|
|
@ -0,0 +1,13 @@
|
||||||
|
error:
|
||||||
|
… from call site
|
||||||
|
at /pwd/lang/eval-fail-undeclared-arg-import.nix:1:1:
|
||||||
|
1| import ./non-eval-trivial-lambda-formals.nix {
|
||||||
|
| ^
|
||||||
|
2| a = "a";
|
||||||
|
|
||||||
|
error: function 'anonymous lambda' called with unexpected argument 'b'
|
||||||
|
at /pwd/lang/non-eval-trivial-lambda-formals.nix:1:1:
|
||||||
|
1| { a }: a
|
||||||
|
| ^
|
||||||
|
2|
|
||||||
|
Did you mean a?
|
|
@ -0,0 +1,4 @@
|
||||||
|
import ./non-eval-trivial-lambda-formals.nix {
|
||||||
|
a = "a";
|
||||||
|
b = "b";
|
||||||
|
}
|
|
@ -0,0 +1 @@
|
||||||
|
{ a }: a
|
Loading…
Add table
Add a link
Reference in a new issue