commit 4df29b5872867f30fea9297264a572577b54d83e
author Tom Cherry <tomcherry@google.com> Mon Apr 13 21:50:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 13 21:50:47 2015 +0000
tree 02090ab3ddc082c32bad5bbcac49d3a1fc860299
parent a132dfa448efc63dcc3681a89bc6426404330958
parent 97a365f618b9359cdfce108f721a85a5c4690fdb

am 17b6a39f: am af59eec7: am e83d8a69: Merge "Fix memory leak in parse_action"

* commit '17b6a39f04c291c6002a22ec60eecdea51f86170':
  Fix memory leak in parse_action

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;