From 856cc81990955ad079d73b3cef7b9b2b376aae03 Mon Sep 17 00:00:00 2001
From: Rot127 <unisono@quyllur.org>
Date: Mon, 22 Apr 2024 13:59:52 -0500
Subject: [PATCH] Fix memleaks

---
 librz/arch/op.c     | 6 ++----
 librz/core/cgraph.c | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/librz/arch/op.c b/librz/arch/op.c
index 2b3097c965a..82727332305 100644
--- a/librz/arch/op.c
+++ b/librz/arch/op.c
@@ -713,10 +713,7 @@ RZ_API void rz_analysis_insn_word_free(RZ_OWN RZ_NULLABLE RzAnalysisInsnWord *iw
 	if (!iword) {
 		return;
 	}
-	rz_strbuf_free(iword->asm_str);
-	rz_pvector_free(iword->insns);
-	set_u_free(iword->jump_targets);
-	set_u_free(iword->call_targets);
+	rz_analysis_insn_word_fini(iword);
 	free(iword);
 }
 
@@ -740,5 +737,6 @@ RZ_API void rz_analysis_insn_word_fini(RZ_OWN RZ_NULLABLE RzAnalysisInsnWord *iw
 	rz_pvector_free(iword->insns);
 	set_u_free(iword->jump_targets);
 	set_u_free(iword->call_targets);
+	rz_il_op_effect_free(iword->il_op);
 	rz_mem_memzero(iword, sizeof(RzAnalysisInsnWord));
 }
diff --git a/librz/core/cgraph.c b/librz/core/cgraph.c
index ac64adf36f9..b1789cbc087 100644
--- a/librz/core/cgraph.c
+++ b/librz/core/cgraph.c
@@ -856,7 +856,8 @@ static void extend_icfg(const RzAnalysis *analysis, RZ_BORROW RzGraph /*<RzGraph
 	RzGraphNode *from_node = get_graph_node_of_fcn(icfg, graph_idx, fcn);
 	RzListIter *it;
 	const RzAnalysisXRef *xref;
-	rz_list_foreach (rz_analysis_function_get_xrefs_from(fcn), it, xref) {
+	RzList *fcn_xrefs = rz_analysis_function_get_xrefs_from(fcn);
+	rz_list_foreach (fcn_xrefs, it, xref) {
 		if (xref->type != RZ_ANALYSIS_XREF_TYPE_CALL) {
 			continue;
 		}
@@ -874,6 +875,7 @@ static void extend_icfg(const RzAnalysis *analysis, RZ_BORROW RzGraph /*<RzGraph
 		// Recurse into called function.
 		extend_icfg(analysis, icfg, graph_idx, called_fcn);
 	}
+	rz_list_free(fcn_xrefs);
 }
 
 /**
@@ -1343,6 +1345,7 @@ RZ_API RZ_OWN RzGraph /*<RzGraphNodeInfo *>*/ *rz_core_graph_cfg_iwords(RZ_NONNU
 	return graph;
 
 error:
+	rz_analysis_insn_word_fini(&cur_iword);
 	rz_warn_if_reached();
 	rz_graph_free(graph);
 	graph = NULL;