Probably fix another memory leak

Author: Noam Preil

assembler/assembler.c

@@ -553,6 +553,13 @@ int try_split_line(struct assembler_state *state, char **line) {
 	return 0;
 }
 
+void macro_free(macro_t *macro) {
+	list_free(macro->parameters);
+	free_flat_list(macro->macro_lines);
+	free(macro->name);
+	free(macro);
+}
+
 object_t *assemble(FILE *file, const char *file_name, assembler_settings_t *settings) {
 	struct assembler_state state = {
 		.object = create_object(),
@@ -700,10 +707,7 @@ object_t *assemble(FILE *file, const char *file_name, assembler_settings_t *sett
 	list_free(state.extra_lines);
 	for (int i = 0; i < state.macros->length; i += 1) {
 		macro_t *macro = state.macros->items[i];
-		list_free(macro->parameters);
-		free_flat_list(macro->macro_lines);
-		free(macro->name);
-		free(macro);
+		macro_free(macro);
 	}
 	list_free(state.macros);
 	// Equates are also added to an area's symbols list, so they're cleaned up there

assembler/directives.c

@@ -440,7 +440,8 @@ int handle_undef(struct assembler_state *state, char **argv, int argc) {
 		macro_t *m = state->macros->items[i];
 		scas_log(L_DEBUG, "Found %s", m->name);
 		if (strcasecmp(m->name, argv[0]) == 0) {
-			scas_log(L_DEBUG, "Undefined Symbol \'%s\'", m->name);
+			scas_log(L_DEBUG, "Undefined macro \'%s\'", m->name);
+			macro_free(m);
 			list_del(state->macros, i);
 			return 1;
 		}

include/assembler.h

@@ -50,5 +50,6 @@ struct assembler_state {
 
 object_t *assemble(FILE *file, const char *file_name, assembler_settings_t *settings);
 void transform_local_labels(tokenized_expression_t *expression, const char *last_global_label);
+void macro_free(macro_t *macro);
 
 #endif