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

* Prevent a potential memory corruption problem if an ATerm garbage

Browse source 
collection happens during fixAttrs().
This commit is contained in:
Eelco Dolstra 2010-03-02 20:23:42 +00:00
parent 158aa89317
commit e14e2399ed
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/parser.y
View file

@ -85,6 +85,10 @@ static Expr fixAttrs(bool recursive, ATermList as)
{ {
Tree attrs; Tree attrs;
/* This ATermMap is needed to ensure that the `leaf' fields in the
Tree nodes are not garbage collected. */
ATermMap gcRoots;
for (ATermIterator i(as); i; ++i) { for (ATermIterator i(as); i; ++i) {
ATermList names, attrPath; Expr src, e; ATerm name, pos; ATermList names, attrPath; Expr src, e; ATerm name, pos;
@ -95,7 +99,9 @@ static Expr fixAttrs(bool recursive, ATermList as)
throw ParseError(format("duplicate definition of attribute `%1%' at %2%") throw ParseError(format("duplicate definition of attribute `%1%' at %2%")
% showAttrPath(ATmakeList1(*j)) % showPos(pos)); % showAttrPath(ATmakeList1(*j)) % showPos(pos));
Tree & t(attrs.children[*j]); Tree & t(attrs.children[*j]);
t.leaf = fromScope ? makeVar(*j) : makeSelect(src, *j); Expr leaf = fromScope ? makeVar(*j) : makeSelect(src, *j);
gcRoots.set(leaf, leaf);
t.leaf = leaf;
t.pos = pos; t.pos = pos;
if (recursive && fromScope) t.recursive = false; if (recursive && fromScope) t.recursive = false;
} }