am e83d8a69: Merge "Fix memory leak in parse_action"

* commit 'e83d8a6900ee53942e5939656c3b6ae177d1f1d2':
  Fix memory leak in parse_action
This commit is contained in:
Tom Cherry 2015-04-13 21:18:42 +00:00 committed by Android Git Automerger
commit af59eec776

View file

@ -946,7 +946,14 @@ static void *parse_action(struct parse_state *state, int nargs, char **args)
for (i = 1; i < nargs; i++) {
if (!(i % 2)) {
if (strcmp(args[i], "&&")) {
struct listnode *node;
struct listnode *node2;
parse_error(state, "& is the only symbol allowed to concatenate actions\n");
list_for_each_safe(node, node2, &act->triggers) {
struct trigger *trigger = node_to_item(node, struct trigger, nlist);
free(trigger);
}
free(act);
return 0;
} else
continue;