wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 09:31:16 +02:00
Code Activity

Fix abort in fromTOML

Browse source 
Fixes #2969.
This commit is contained in:
Eelco Dolstra 2019-06-24 17:09:09 +02:00
parent 99cec651c9
commit 94f11d0a61
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/primops/fromTOML.cc
View file

@ -49,6 +49,19 @@ static void prim_fromTOML(EvalState & state, const Pos & pos, Value * * args, Va
visit(*(v.listElems()[i] = state.allocValue()), t2->get()[i]);
}
// Handle cases like 'a = [[{ a = true }]]', which IMHO should be
// parsed as a array containing an array containing a table,
// but instead are parsed as an array containing a table array
// containing a table.
else if (auto t2 = t->as_table_array()) {
size_t size = t2->get().size();
state.mkList(v, size);
for (size_t j = 0; j < size; ++j)
visit(*(v.listElems()[j] = state.allocValue()), t2->get()[j]);
}
else if (t->is_value()) {
if (auto val = t->as<int64_t>())
mkInt(v, val->get());