nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 21:16:02 +01:00
Code Activity

libexpr: Fix Value::mkList for empty lists

Browse source 
This code used to save the pointer to a small
list allocated on the stack to the Value, which
is unintended.
This commit is contained in:
Sergei Zimmerman 2025-09-10 00:21:57 +03:00
parent 3c331b7ef3
commit 2ed2c79721
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/include/nix/expr/value.hh
View file

@ -993,12 +993,20 @@ public:
void mkList(const ListBuilder & builder) noexcept void mkList(const ListBuilder & builder) noexcept
{ {
if (builder.size == 1) switch (builder.size) {
case 0:
setStorage(List{.size = 0, .elems = nullptr});
break;
case 1:
setStorage(std::array<Value *, 2>{builder.inlineElems[0], nullptr}); setStorage(std::array<Value *, 2>{builder.inlineElems[0], nullptr});
else if (builder.size == 2) break;
case 2:
setStorage(std::array<Value *, 2>{builder.inlineElems[0], builder.inlineElems[1]}); setStorage(std::array<Value *, 2>{builder.inlineElems[0], builder.inlineElems[1]});
else break;
default:
setStorage(List{.size = builder.size, .elems = builder.elems}); setStorage(List{.size = builder.size, .elems = builder.elems});
break;
}
} }
inline void mkThunk(Env * e, Expr * ex) noexcept inline void mkThunk(Env * e, Expr * ex) noexcept