[apparmor] [PATCH 1/3] parser: Use free_cod_entries() when merging file entries

[Tyler Hicks]

Reuse free_cod_entries() when freeing merged file entries in
process_file_entries().

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 parser/parser_merge.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/parser/parser_merge.c b/parser/parser_merge.c
index cc9f669..04ff6df 100644
--- a/parser/parser_merge.c
+++ b/parser/parser_merge.c
@@ -118,10 +118,8 @@ static int process_file_entries(struct codomain *cod)
 //fprintf(stderr, "warning: merging rule 0x%x %s\n", next->audit, next->name);
 			cur->mode |= next->mode;
 			cur->audit |= next->audit;
-			free(next->name);
-			if (next->link_name)
-				free(next->link_name);
-			free(next);
+			next->next = NULL;
+			free_cod_entries(next);
 			table[n] = NULL;
 		} else {
 			cur = next;
-- 
1.8.3.2