commit 2456c37021e350a21737f29ff5ed0a39d146d9ca
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 20 01:14:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 20 01:14:58 2019 +0000
tree af5a15c7414223932359ffd55e67b2f177ca2c7e
parent 93313741137c4336d4900f3d78865f47c9a2fca4
parent bf2f9270195fc7425ce1712281a5e48147cc5091

Merge "Fix memory leaks"

tools/sepolicy-analyze/neverallow.c

diff --git a/tools/sepolicy-analyze/neverallow.c b/tools/sepolicy-analyze/neverallow.c
index 25e6a0c..0209678 100644
--- a/tools/sepolicy-analyze/neverallow.c
+++ b/tools/sepolicy-analyze/neverallow.c
@@ -380,6 +380,7 @@
     size_t keyword_size = strlen(keyword), len;
     struct avrule *neverallows = NULL, *avrule;
     char *p, *start;
+    int result;
 
     p = text;
     while (p < end) {
@@ -434,12 +435,19 @@
     if (!neverallows)
         goto err;
 
-    return check_assertions(NULL, policydb, neverallows);
+    result = check_assertions(NULL, policydb, neverallows);
+    avrule_list_destroy(neverallows);
+    return result;
 err:
     if (errno == ENOMEM) {
         fprintf(stderr, "Out of memory while parsing neverallow rules\n");
     } else
         fprintf(stderr, "Error while parsing neverallow rules\n");
+
+    avrule_list_destroy(neverallows);
+    if (avrule != neverallows)
+        avrule_destroy(avrule);
+
     return -1;
 }