dwarf: fix heap overflow (#3930)

rizinorg · Oct 18, 2023 · 77778e9 · 77778e9
1 parent 6b0fbb6
commit 77778e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/librz/analysis/dwarf_process.c b/librz/analysis/dwarf_process.c
@@ -1965,6 +1965,7 @@ static bool dwarf_integrate_function(void *user, const ut64 k, const void *value
 	RzAnalysisDwarfVariable *dw_var;
 	rz_vector_foreach(&dw_fn->variables, dw_var) {
 		RzAnalysisVar *var = RZ_NEW0(RzAnalysisVar);
+		rz_analysis_var_init(var);
 		if (!RzAnalysisDwarfVariable_as_RzAnalysisVar(analysis, fn, dw_var, var)) {
 			free(var);
 			continue;

diff --git a/librz/core/cbin.c b/librz/core/cbin.c
@@ -1702,8 +1702,9 @@ static bool bin_dwarf(RzCore *core, RzBinFile *binfile, RzCmdStateOutput *state)
 		return false;
 	}
 
-	RzBinDWARF *dw = core->analysis->debug_info->dw;
-	dw = dw ? dw : rz_bin_dwarf_from_file(binfile);
+	RzBinDWARF *dw = (core->analysis && core->analysis->debug_info && core->analysis->debug_info->dw)
+		? core->analysis->debug_info->dw
+		: rz_bin_dwarf_from_file(binfile);
 	if (!dw) {
 		return false;
 	}