Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-13 02:21:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use r_core_flag_get_by_spaces() in getFunctionName() ##rizin (#18285)

Browse Source 
Co-authored-by: Paul I <pelijah@users.noreply.github.com>
This commit is contained in:
pancake 2021-01-25 11:57:34 +01:00 committed by GitHub
parent 85edbad0aa
commit 98868585c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libr/core/canal.c
View File

@ -89,8 +89,7 @@ static int cmpaddr (const void *_a, const void *_b) {
return (a->addr > b->addr)? 1: (a->addr < b->addr)? -1: 0;
}
static char *getFunctionName(RCore *core, ut64 addr) {
static char *get_function_name(RCore *core, ut64 addr) {
RBinFile *bf = r_bin_cur (core->bin);
if (bf && bf->o) {
Sdb *kv = bf->o->addr2klassmethod;
@ -100,17 +99,8 @@ static char *getFunctionName(RCore *core, ut64 addr) {
return res;
}
}
RListIter *iter;
RFlagItem *flag;
const RList* flags = r_flag_get_list (core->flags, addr);
const char *name = NULL;
r_list_foreach (flags, iter, flag) {
name = flag->name;
if (r_str_startswith (name, "sym.")) {
break;
}
}
return name ? strdup (name) : NULL;
RFlagItem *flag = r_core_flag_get_by_spaces (core->flags, addr);
return (flag && flag->name) ? strdup (flag->name) : NULL;
}
static RCore *mycore = NULL;
@ -778,7 +768,7 @@ static int __core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dep
fcn->bits = core->anal->bits;
}
fcn->addr = at;
fcn->name = getFunctionName (core, at);
fcn->name = get_function_name (core, at);
if (!fcn->name) {
fcn->name = r_str_newf ("%s.%08"PFMT64x, fcnpfx, at);