Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-04 11:43:39 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Implement aaFa, optimize and improve boundary checks

Browse Source
This commit is contained in:
pancake 2019-02-14 02:47:55 +01:00 committed by radare
parent f1b32b351b
commit 0901c48871
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libr/core/canal.c
View File

@ -4775,15 +4775,16 @@ static int __addrs_cmp(void *_a, void *_b) {
return 0;
}
static int coco = 0;
#define MAXFCNSIZE 1024*1024*1
R_API void r_core_anal_inflags(RCore *core, const char *glob) {
RList *addrs = r_list_newf (free);
RListIter *iter;
bool a2f = r_config_get_i (core->config, "anal.a2f");
char *anal_in = strdup (r_config_get (core->config, "anal.in"));
r_config_set (core->config, "anal.in", "block");
// aaFa = use a2f instead of af+
bool simple = (glob && *glob == 'a')? false: true;
glob = r_str_trim_ro (glob);
bool simple = 1;
char *addr;
r_flag_foreach_glob (core->flags, glob, __cb, addrs);
// should be sorted already
@ -4793,13 +4794,24 @@ R_API void r_core_anal_inflags(RCore *core, const char *glob) {
break;
}
char *addr2 = iter->n->data;
if (!addr || !addr2) {
break;
}
ut64 a0 = r_num_get (NULL, addr);
ut64 a1 = r_num_get (NULL, addr2);
if (a0 == a1) {
// ignore
continue;
}
if (a0 > a1) {
eprintf ("Warning: unsorted flag list %d 0x%llx 0x%llx\n", coco++, a0, a1);
eprintf ("Warning: unsorted flag list 0x%llx 0x%llx\n", a0, a1);
continue;
}
st64 sz = a1 - a0;
if (sz < 1 || sz > MAXFCNSIZE) {
eprintf ("Warning: invalid flag range from 0x%08"PFMT64x" to 0x%08"PFMT64x"\n", a0, a1);
continue;
}
if (simple) {
RFlagItem *fi = r_flag_get_at (core->flags, a0, 0);
r_core_cmdf (core, "af+ %s fcn.%s", addr, fi? fi->name: addr);

9
libr/core/cmd_anal.c
View File

@ -43,6 +43,7 @@ static const char *help_msg_aa[] = {
"aae", " [len] ([addr])", "analyze references with ESIL (optionally to address)",
"aaf", "[e|t] ", "analyze all functions (e anal.hasnext=1;afr @@c:isq) (aafe=aef@@f)",
"aaF", " [sym*]", "set anal.in=block for all the spaces between flags matching glob",
"aaFa", " [sym*]", "same as aaF but uses af/a2f instead of af+/afb+ (slower but more accurate)",
"aai", "[j]", "show info of all analysis parameters",
"aan", "", "autoname functions that either start with fcn.* or sym.func.*",
"aang", "", "find function and symbol names from golang binaries",
@ -7594,8 +7595,12 @@ static int cmd_anal_all(RCore *core, const char *input) {
r_core_cmd0 (core, "af @@= `isq~[0]`");
r_core_cmd0 (core, "af @@ entry*");
break;
case 'F': // "aaF"
r_core_anal_inflags (core, input + 1);
case 'F': // "aaF" "aaFa"
if (!input[1] || input[1] == ' ' || input[1] == 'a') {
r_core_anal_inflags (core, input + 1);
} else {
eprintf ("Usage: aaF[a] - analyze functions in flag bounds (aaFa uses af/a2f instead of af+/afb+)\n");
}
break;
case 'n': // "aan"
switch (input[1]) {