commit d0b6de41f8b36df751962e28803db7a4375751ff
author Ed Tam <etam@google.com> Mon Apr 13 23:37:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 13 23:37:52 2015 +0000
tree b1350343701dccd609de5b167199748145395b21
parent 17b6a39f04c291c6002a22ec60eecdea51f86170
parent 438443e742d9cfb91c1193144a3b41744ffad34b

Merge "resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

init/init_parser.cpp

diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index af935d7..ff31093 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -946,7 +946,14 @@
     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;