puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

builtins.{any,all}: Use constant errorCtx

Browse source 
Clang warned that the expanded code used to have a buffer overflow.
Very strange, but also very avoidable.
This commit is contained in:
Robert Hensing 2023-11-16 12:18:37 +01:00
parent 9fa133dde5
commit 206ece0f41
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/primops.cc
View file

@ -3189,10 +3189,14 @@ static void anyOrAll(bool any, EvalState & state, const PosIdx pos, Value * * ar
state.forceFunction(*args[0], pos, std::string("while evaluating the first argument passed to builtins.") + (any ? "any" : "all")); state.forceFunction(*args[0], pos, std::string("while evaluating the first argument passed to builtins.") + (any ? "any" : "all"));
state.forceList(*args[1], pos, std::string("while evaluating the second argument passed to builtins.") + (any ? "any" : "all")); state.forceList(*args[1], pos, std::string("while evaluating the second argument passed to builtins.") + (any ? "any" : "all"));
std::string_view errorCtx = any
? "while evaluating the return value of the function passed to builtins.any"
: "while evaluating the return value of the function passed to builtins.all";
Value vTmp; Value vTmp;
for (auto elem : args[1]->listItems()) { for (auto elem : args[1]->listItems()) {
state.callFunction(*args[0], *elem, vTmp, pos); state.callFunction(*args[0], *elem, vTmp, pos);
bool res = state.forceBool(vTmp, pos, std::string("while evaluating the return value of the function passed to builtins.") + (any ? "any" : "all")); bool res = state.forceBool(vTmp, pos, errorCtx);
if (res == any) { if (res == any) {
v.mkBool(any); v.mkBool(any);
return; return;