commit 20ad01ed350fd70f08b8713580c7a577017fa26d
author Manoj Gupta <manojgupta@google.com> Wed Aug 02 02:52:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 02:52:06 2017 +0000
tree 42f3a8becf7865670ee77fea3df079e6492cee8b
parent b057d62eb2f374423df101c7b1eeddb09d58f2d5
parent 508db351a1b52278c5180e2f2df01b196355b1e3

Merge "Fix static analyzer warnings." am: 4b547a1516
am: 508db351a1

Change-Id: I123d86d49b0f17d74d7108f101720101254ea810

tools/sepolicy-analyze/neverallow.c

diff --git a/tools/sepolicy-analyze/neverallow.c b/tools/sepolicy-analyze/neverallow.c
index 26ce144..25e6a0c 100644
--- a/tools/sepolicy-analyze/neverallow.c
+++ b/tools/sepolicy-analyze/neverallow.c
@@ -258,6 +258,7 @@
         node->next = classperms;
         classperms = node;
         free(id);
+        id = NULL;
     } while (p < end && openparens);
 
     if (p == end)
@@ -325,6 +326,8 @@
         if (!strcmp(id, "*")) {
             for (node = classperms; node; node = node->next)
                 node->data = ~0;
+            free(id);
+            id = NULL;
             continue;
         }
 
@@ -341,6 +344,7 @@
             node->data |= 1U << (perm->s.value - 1);
         }
         free(id);
+        id = NULL;
     } while (p < end && openparens);
 
     if (p == end)
@@ -361,6 +365,12 @@
     *ptr = p;
     return 0;
 err:
+    // free classperms memory
+    for (node = classperms; node; ) {
+      class_perm_node_t *freeptr = node;
+      node = node->next;
+      free(freeptr);
+    }
     return -1;
 }