commit 4b547a151618be29cf2f5c0d91787275c048d683
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 02 02:35:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 02 02:35:48 2017 +0000
tree 37bc66b729a4f597ed07dd5f4d2916bc57893848
parent df9649503a085b1316e392a4807ef91e9f4ef9a4
parent 3cdd4a4b0d7e92d31e3d47d8a36e3cc11585ea6d

Merge "Fix static analyzer warnings."

tools/sepolicy-analyze/neverallow.c

diff --git a/tools/sepolicy-analyze/neverallow.c b/tools/sepolicy-analyze/neverallow.c
index b288ea7..337d6ee 100644
--- a/tools/sepolicy-analyze/neverallow.c
+++ b/tools/sepolicy-analyze/neverallow.c
@@ -261,6 +261,7 @@
         node->next = classperms;
         classperms = node;
         free(id);
+        id = NULL;
     } while (p < end && openparens);
 
     if (p == end)
@@ -328,6 +329,8 @@
         if (!strcmp(id, "*")) {
             for (node = classperms; node; node = node->next)
                 node->data = ~0;
+            free(id);
+            id = NULL;
             continue;
         }
 
@@ -344,6 +347,7 @@
             node->data |= 1U << (perm->s.value - 1);
         }
         free(id);
+        id = NULL;
     } while (p < end && openparens);
 
     if (p == end)
@@ -364,6 +368,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;
 }