aav output is now cleaner and less verbose ##anal

This commit is contained in:
pancake 2022-05-26 11:15:45 +02:00 committed by pancake
parent 73721d1ca4
commit 597496e17a
4 changed files with 5 additions and 18 deletions

View File

@ -1177,11 +1177,6 @@ R_API R2RProcessOutput *r2r_run_fuzz_test(R2RRunConfig *config, R2RFuzzTest *tes
const char *cmd = "aaa";
RList *files = r_list_new ();
r_list_push (files, test->file);
#if ASAN
if (r_str_endswith (test->file, "/swift_read")) {
cmd = "?F";
}
#endif
R2RProcessOutput *ret = run_r2_test (config, config->timeout_ms, cmd, files, NULL, false, runner, user);
r_list_free (files);
return ret;
@ -1229,7 +1224,6 @@ static bool check_cmd_asan_result(R2RProcessOutput *out) {
&& !strstr (out->out, "FATAL:"));
bool stderr_success = !out->err || (!strstr (out->err, "Sanitizer")
&& !strstr (out->err, "runtime error:");
return stdout_success && stderr_success;
}
#endif

View File

@ -10916,8 +10916,6 @@ static void cmd_anal_aav(RCore *core, const char *input) {
if (core->rasm->config->bits == 64) {
vsize = 8;
}
// body
oldstr = r_print_rowlog (core->print, "Analyze value pointers (aav)");
r_print_rowlog_done (core->print, oldstr);
r_cons_break_push (NULL, NULL);
@ -10932,9 +10930,6 @@ static void cmd_anal_aav(RCore *core, const char *input) {
if (r_cons_is_breaked ()) {
break;
}
r_strf_var (msg, 128, "... from 0x%"PFMT64x" to 0x%"PFMT64x"", r_io_map_begin (map), r_io_map_end (map));
oldstr = r_print_rowlog (core->print, msg);
r_print_rowlog_done (core->print, oldstr);
(void)r_core_search_value_in_range (core, relative, map->itv,
r_io_map_begin (map), r_io_map_end (map), vsize, _CbInRangeAav, (void *)(size_t)asterisk);
}
@ -10956,13 +10951,10 @@ static void cmd_anal_aav(RCore *core, const char *input) {
//TODO: Reduce multiple hits for same addr
from = r_itv_begin (map2->itv);
to = r_itv_end (map2->itv);
r_strf_var (msg, 128, "... from 0x%"PFMT64x" to 0x%"PFMT64x"", from, to);
oldstr = r_print_rowlog (core->print, msg);
if ((to - from) > MAX_SCAN_SIZE) {
eprintf ("Warning: Skipping large region\n");
continue;
}
r_print_rowlog_done (core->print, oldstr);
r_list_foreach (list, iter, map) {
ut64 begin = r_io_map_begin (map);
ut64 end = r_io_map_end (map);
@ -10974,7 +10966,7 @@ static void cmd_anal_aav(RCore *core, const char *input) {
r_print_rowlog_done (core->print, oldstr);
continue;
}
r_strf_var (msg2, 128, "0x%08"PFMT64x"-0x%08"PFMT64x" in 0x%"PFMT64x"-0x%"PFMT64x" (aav)", from, to, begin, end);
r_strf_var (msg2, 128, "aav: 0x%08"PFMT64x"-0x%08"PFMT64x" in 0x%"PFMT64x"-0x%"PFMT64x, from, to, begin, end);
oldstr = r_print_rowlog (core->print, msg2);
r_print_rowlog_done (core->print, oldstr);
(void)r_core_search_value_in_range (core, relative, map->itv, from, to, vsize, _CbInRangeAav, (void *)(size_t)asterisk);
@ -10984,7 +10976,6 @@ static void cmd_anal_aav(RCore *core, const char *input) {
}
beach:
r_cons_break_pop ();
// end
r_config_set (core->config, "anal.in", tmp);
free (tmp);
seti ("search.align", o_align);

View File

@ -474,6 +474,10 @@ static int cmd_info(void *data, const char *input) {
Sdb *db;
PJ *pj = NULL;
if (r_str_startswith (input, "ddqd")) {
r_cons_printf ("GOD MODE ON\n");
return 0;
}
for (i = 0; input[i] && input[i] != ' '; i++)
;
if (i > 0) {

View File

@ -67,8 +67,6 @@ static int cmd_quit(void *data, const char *input) {
} else if (input[1] == 'n') {
core->num->value += 2;
}
//exit (*input?r_num_math (core->num, input+1):0);
//if (core->http_up) return false; // cancel quit when http is running
return R_CMD_RC_QUIT;
}
return R_CMD_RC_SUCCESS;