Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-02 02:06:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fixes for autofunction name

Browse Source
This commit is contained in:
pancake 2015-01-30 00:22:48 +01:00
parent 9dda6c9fc5
commit 918d2a3144
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/anal/fcn.c
View File

@ -115,7 +115,7 @@ R_API int r_anal_fcn_xref_add (RAnal *a, RAnalFunction *fcn, ut64 at, ut64 addr,
r_list_append (fcn->refs, ref);
#endif
#if FCN_SDB
sdb_add (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x".name"), fcn->name, 0);
sdb_add (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x".name", fcn->addr), fcn->name, 0);
// encode the name in base64 ?
sdb_num_add (DB, sdb_fmt (0, "fcn.name.%s", fcn->name), fcn->addr, 0);
sdb_array_add_num (DB,

16
libr/core/anal.c
View File

@ -754,6 +754,13 @@ R_API int r_core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dept
fcn->addr = at;
fcn->size = 0;
fcn->name = r_str_newf ("fcn.%08"PFMT64x, at);
if (0) {
RFlagItem *item = r_flag_get_i (core->flags, at);
if (item) {
free (fcn->name);
fcn->name = strdup (item->name);
}
}
if (!(buf = malloc (ANALBS))) { //core->blocksize))) {
eprintf ("Error: malloc (buf)\n");
goto error;
@ -802,6 +809,7 @@ R_API int r_core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dept
}
}
//at = fcn->addr;
#if 1
{
RFlagItem *f = r_flag_get_i (core->flags, fcn->addr);
free (fcn->name);
@ -811,21 +819,25 @@ R_API int r_core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dept
fcn->name = r_str_newf ("fcn.%08"PFMT64x, fcn->addr);
}
}
#endif
// HACK
//r_anal_fcn_insert (core->anal, fcn);
if (fcnlen == R_ANAL_RET_ERROR ||
(fcnlen == R_ANAL_RET_END && fcn->size < 1)) { /* Error analyzing function */
goto error;
} else if (fcnlen == R_ANAL_RET_END) { /* Function analysis complete */
RFlagItem *f = r_flag_get_i2 (core->flags, fcn->addr);
RFlagItem *f = r_flag_get_i (core->flags, fcn->addr);
free (fcn->name);
if (f) { /* Check if it's already flagged */
fcn->name = strdup (f->name); // memleak here?
fcn->name = strdup (f->name);
// fcn->name = r_str_newf ("fcn.%s", f->name);
} else {
#if 1
fcn->name = r_str_newf ("%s.%08"PFMT64x,
fcn->type == R_ANAL_FCN_TYPE_LOC? "loc":
fcn->type == R_ANAL_FCN_TYPE_SYM? "sym":
fcn->type == R_ANAL_FCN_TYPE_IMP? "imp": "fcn", fcn->addr);
#endif
/* Add flag */
r_flag_space_set (core->flags, "functions");
r_flag_set (core->flags, fcn->name,

7
libr/core/cmd_flag.c
View File

@ -395,6 +395,9 @@ static int cmd_flag(void *data, const char *input) {
*new = 0;
new++;
item = r_flag_get (core->flags, old);
if (!item && !strncmp (old, "fcn.", 4)) {
item = r_flag_get (core->flags, old+4);
}
} else {
new = old;
item = r_flag_get_i (core->flags, core->offset);
@ -402,7 +405,9 @@ static int cmd_flag(void *data, const char *input) {
if (item) {
if (!r_flag_rename (core->flags, item, new))
eprintf ("Invalid name\n");
} else eprintf ("Cannot find flag\n");
} else {
eprintf ("Cannot find flag (%s)\n", old);
}
}
break;
case 'n':