Link DWARF types only when prototypes match ##analysis

Author: radare

libr/anal/dwarf_process.c

@@ -1614,27 +1614,35 @@ static bool dwarf_function_type_matches(Sdb *types, const char *name, const char
 	return true;
 }
 
-static char *dwarf_function_type_name(Context *ctx, const char *sname, const Function *dwarf_fcn, const char *ret_type, RList/*<Variable*>*/ *variables, bool has_unspecified_parameters) {
-	R_RETURN_VAL_IF_FAIL (ctx && ctx->anal && sname && dwarf_fcn && ret_type && variables, NULL);
+static char *dwarf_function_type_name(Context *ctx, const char *sname, const Function *dwarf_fcn, const char *ret_type, RList/*<Variable*>*/ *variables, bool has_unspecified_parameters, bool *type_matches) {
+	R_RETURN_VAL_IF_FAIL (ctx && ctx->anal && sname && dwarf_fcn && ret_type && variables && type_matches, NULL);
+	*type_matches = false;
 	Sdb *types = ctx->anal->sdb_types;
 	const char *previous_name = sdb_const_getf (ctx->sdb, NULL, "fcn.%s.name", sname);
 	const char *previous = sdb_const_getf (ctx->sdb, NULL, "fcn.%s.typed_name", sname);
 	if (previous_name && !strcmp (previous_name, dwarf_fcn->name)
 		&& previous && dwarf_function_type_matches (types, previous,
 			ret_type, variables, has_unspecified_parameters)) {
+		*type_matches = true;
 		return strdup (previous);
 	}
 	char *name = sanitize_c_identifier (dwarf_fcn->name);
-	if (!name || !sdb_const_get (types, name, 0)
-		|| dwarf_function_type_matches (types, name, ret_type,
+	if (!name || !sdb_const_get (types, name, 0)) {
+		return name;
+	}
+	if (dwarf_function_type_matches (types, name, ret_type,
 			variables, has_unspecified_parameters)) {
+		*type_matches = true;
 		return name;
 	}
 	char *candidate = r_str_newf ("%s_%" PFMT64x, name, dwarf_fcn->addr);
 	int suffix = 2;
-	while (candidate && sdb_const_get (types, candidate, 0)
-		&& !dwarf_function_type_matches (types, candidate, ret_type,
-			variables, has_unspecified_parameters)) {
+	while (candidate && sdb_const_get (types, candidate, 0)) {
+		if (dwarf_function_type_matches (types, candidate, ret_type,
+				variables, has_unspecified_parameters)) {
+			*type_matches = true;
+			break;
+		}
 		free (candidate);
 		candidate = r_str_newf ("%s_%" PFMT64x "_%d", name, dwarf_fcn->addr, suffix++);
 	}
@@ -1705,7 +1713,7 @@ static bool import_dwarf_function_fallback(RAnal *anal, const char *typed_name,
 	return true;
 }
 
-static void import_dwarf_function_type(Context *ctx, const char *sname, const char *typed_name, Function *dwarf_fcn, const char *ret_type, RList/*<Variable*>*/ *variables, bool has_unspecified_parameters) {
+static void import_dwarf_function_type(Context *ctx, const char *sname, const char *typed_name, Function *dwarf_fcn, const char *ret_type, RList/*<Variable*>*/ *variables, bool has_unspecified_parameters, bool type_matches) {
 	R_RETURN_IF_FAIL (ctx && ctx->anal && sname && typed_name && dwarf_fcn && ret_type && variables);
 	RAnal *anal = (RAnal *)ctx->anal;
 	sdb_setf (ctx->sdb, typed_name, 0, "fcn.%s.typed_name", sname);
@@ -1751,7 +1759,9 @@ static void import_dwarf_function_type(Context *ctx, const char *sname, const ch
 			(void)import_dwarf_function_fallback (anal, typed_name, ret_type, variables, has_unspecified_parameters);
 		}
 	}
-	if (dwarf_fcn->prototype_complete && r_type_func_exist (anal->sdb_types, typed_name)) {
+	if (dwarf_fcn->prototype_complete && r_type_func_exist (anal->sdb_types, typed_name)
+		&& (type_matches || dwarf_function_type_matches (anal->sdb_types, typed_name,
+			ret_type, variables, has_unspecified_parameters))) {
 		const char *linked = sdb_const_getf (anal->sdb_types, NULL,
 			"fcnlink.%08" PFMT64x, dwarf_fcn->addr);
 		if (!linked || !strcmp (linked, typed_name)) {
@@ -1771,8 +1781,9 @@ static void sdb_save_dwarf_function(Context *ctx, Function *dwarf_fcn, const cha
 		free (real_name);
 		return;
 	}
+	bool type_matches = false;
 	char *typed_name = dwarf_function_type_name (ctx, sname, dwarf_fcn,
-		ret_type, variables, has_unspecified_parameters);
+		ret_type, variables, has_unspecified_parameters, &type_matches);
 	sdb_set (sdb, sname, "fcn", 0);
 
 	char *addr_val = r_str_newf ("0x%" PFMT64x, dwarf_fcn->addr);
@@ -1824,7 +1835,7 @@ static void sdb_save_dwarf_function(Context *ctx, Function *dwarf_fcn, const cha
 	r_strbuf_fini (&vars_buf);
 	r_strbuf_fini (&args_buf);
 	if (typed_name) {
-		import_dwarf_function_type (ctx, sname, typed_name, dwarf_fcn, ret_type, variables, has_unspecified_parameters);
+		import_dwarf_function_type (ctx, sname, typed_name, dwarf_fcn, ret_type, variables, has_unspecified_parameters, type_matches);
 	}
 	free (typed_name);
 	free (real_name);

test/db/formats/dwarf

@@ -15,6 +15,8 @@ FILE=bins/elf/dwarf3_cpp.elf
 CMDS=<<EOF
 e asm.dwarf=false
 aaa
+k anal/types/fcnlink.00001169
+afs @ 0x1169
 k anal/types/fcnlink.0000130e
 afs @ 0x130e
 aaa
@@ -24,6 +26,8 @@ tl overridden = 0x130e
 afs @ 0x130e
 EOF
 EXPECT=<<EOF
+main_1169
+int main_1169 ();
 Bird_Bird_
 void Bird_Bird_ (Bird * const this);
 void Bird_Bird_ (Bird * const this);