Fix null deref in aap

radare · radare · commit 838732e0b00e · 2024-05-04T12:37:18.000+02:00
diff --git a/src/anal_ghidra.cpp b/src/anal_ghidra.cpp
@@ -1,4 +1,4 @@
-/* r2ghidra - LGPL - Copyright 2020-2023 - pancake, FXTi */
+/* r2ghidra - LGPL - Copyright 2020-2024 - pancake, FXTi */
 
 #include <r_lib.h>
 #include <r_anal.h>
@@ -2211,7 +2211,7 @@ extern "C" RList *r2ghidra_preludes(RArchSession *as) {
 	}
 	r_list_foreach (as->arch->plugins, iter, _plugin) {
 		RArchPlugin *plugin = (RArchPlugin*)_plugin;
-		if (plugin->meta.name && !strcmp (plugin->meta.name, cpu)) {
+		if (plugin->preludes && plugin->meta.name && !strcmp (plugin->meta.name, cpu)) {
 			return plugin->preludes (as);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* r2ghidra - LGPL - Copyright 2020-2023 - pancake, FXTi */`
	`1`	`+/* r2ghidra - LGPL - Copyright 2020-2024 - pancake, FXTi */`
`2`	`2`
`3`	`3`	`#include <r_lib.h>`
`4`	`4`	`#include <r_anal.h>`
`@@ -2211,7 +2211,7 @@ extern "C" RList r2ghidra_preludes(RArchSession as) {`
`2211`	`2211`	`}`
`2212`	`2212`	`r_list_foreach (as->arch->plugins, iter, _plugin) {`
`2213`	`2213`	`RArchPlugin plugin = (RArchPlugin)_plugin;`
`2214`		`- if (plugin->meta.name && !strcmp (plugin->meta.name, cpu)) {`
	`2214`	`+ if (plugin->preludes && plugin->meta.name && !strcmp (plugin->meta.name, cpu)) {`
`2215`	`2215`	`return plugin->preludes (as);`
`2216`	`2216`	`}`
`2217`	`2217`	`}`