Bugfix

* src/tree.c (node_reduce): Return 1 if the node has been freed.
(reduceproc): Avoid descending into freed nodes.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/tree.c b/src/tree.c
index 0eabc21..eb8b131 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1029,7 +1029,7 @@ node_merge_block(struct grecs_node *to_node, struct grecs_node *from_node,
 	from_node->down = NULL;
 }
 
-static void
+static int
 node_reduce(struct grecs_node *node, struct grecs_keyword *kwp, int flags)
 {
 	struct grecs_node *p;
@@ -1050,7 +1050,9 @@ node_reduce(struct grecs_node *node, struct grecs_keyword *kwp, int flags)
 		}
 		grecs_node_unlink(node);
 		grecs_node_free(node);
+		return 1;
 	}
+	return 0;
 }
 
 static enum grecs_tree_recurse_res
@@ -1074,13 +1076,15 @@ reduceproc(enum grecs_tree_recurse_op op, struct grecs_node *node, void *data)
 			}
 			if (kwp->flags & GRECS_INAC)
 				return grecs_tree_recurse_skip;
+			if (!(kwp->flags & GRECS_MULT) &&
+			    node_reduce(node, kwp, clos->flags))
+				return grecs_tree_recurse_skip;
 			if (op == grecs_tree_recurse_pre) {
 				grecs_list_push(clos->sections, clos->cursect);
 				clos->cursect = kwp;
 			} 
-		}
-		if (!(kwp && (kwp->flags & GRECS_MULT)))
-			node_reduce(node, kwp, clos->flags);
+		} else if (node_reduce(node, kwp, clos->flags))
+			return grecs_tree_recurse_skip;
 	}
 	return grecs_tree_recurse_ok;
 }