Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-03 11:50:02 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Skip metadata within anal.hasnext

Browse Source
This commit is contained in:
pancake 2016-04-22 00:03:09 +02:00
parent 648ed4b259
commit b0d91c741e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/core/anal.c
View File

@ -511,11 +511,17 @@ static int core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int depth
break;
}
if (i == nexti) {
ut64 at = fcn->addr + fcn->size;
while (true) {
const RAnalMetaItem *mi = r_meta_find (core->anal, at, R_META_TYPE_ANY, 0);
if (!mi) break;
at += mi->size;
}
// TODO: ensure next address is function after padding (nop or trap or wat)
// XXX noisy for test cases because we want to clear the stderr
r_cons_clear_line (1);
loganal (fcn->addr, fcn->addr+fcn->size, 10000 - depth);
next = next_append (next, &nexti, fcn->addr + fcn->size);
loganal (fcn->addr, at, 10000 - depth);
next = next_append (next, &nexti, at);
}
}
}

2
libr/core/bin.c
View File

@ -2062,7 +2062,7 @@ static void bin_elf_versioninfo(RCore *r) {
r_cons_printf ("Version need section '%s' contains %d entries:\n",
sdb_const_get (sdb, "section_name", 0), sdb_num_get (sdb, "num_entries", 0));
r_cons_printf (" Addr: %p", (void*)sdb_num_get (sdb, "addr", 0));
r_cons_printf (" Addr: 0x%08"PFMT64x"\n", sdb_num_get (sdb, "addr", 0));
r_cons_printf (" Offset: %#x Link to section: %x (%s)\n",
sdb_num_get (sdb, "offset", 0), sdb_num_get (sdb, "link", 0),