checkpolicy/module_compiler: cleanup stack on exit

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
cgzones · Nov 8, 2023 · 6aaff88 · 6aaff88
1 parent 8004b9b
commit 6aaff88
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/checkpolicy/checkmodule.c b/checkpolicy/checkmodule.c
@@ -32,6 +32,7 @@
 
 #include "queue.h"
 #include "checkpolicy.h"
+#include "module_compiler.h"
 #include "parse_util.h"
 
 extern int mlspol;
@@ -365,13 +366,15 @@ int main(int argc, char **argv)
 		goto exit;
 	}
 
+	module_compiler_cleanup();
 	sepol_sidtab_destroy(&sidtab);
 	policydb_destroy(&modpolicydb);
 
 	return 0;
 
     exit:
-	sepol_sidtab_destroy(&sidtab);
+        module_compiler_cleanup();
+        sepol_sidtab_destroy(&sidtab);
 	policydb_destroy(&modpolicydb);
 
 	return 1;

diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c
@@ -92,6 +92,7 @@
 
 #include "queue.h"
 #include "checkpolicy.h"
+#include "module_compiler.h"
 #include "parse_util.h"
 
 extern policydb_t *policydbp;
@@ -1332,13 +1333,15 @@ int main(int argc, char **argv)
 	}
 
       out:
+	module_compiler_cleanup();
 	sepol_sidtab_destroy(&sidtab);
 	policydb_destroy(&policydb);
 	policydb_destroy(&parse_policy);
 
 	return 0;
 
       err:
+	module_compiler_cleanup();
 	sepol_sidtab_destroy(&sidtab);
 	policydb_destroy(&policydb);
 	policydb_destroy(&parse_policy);

diff --git a/checkpolicy/module_compiler.c b/checkpolicy/module_compiler.c
@@ -1492,3 +1492,9 @@ static void pop_stack(void)
 	free(stack_top);
 	stack_top = parent;
 }
+
+void module_compiler_cleanup()
+{
+	while (stack_top)
+		pop_stack();
+}
diff --git a/checkpolicy/module_compiler.h b/checkpolicy/module_compiler.h
@@ -106,4 +106,6 @@ int begin_optional_else(int pass);
  * return -1. */
 int end_avrule_block(int pass);
 
+void module_compiler_cleanup(void);
+
 #endif