Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-26 07:44:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #3112 - Honor search.align in /R

Browse Source
This commit is contained in:
pancake 2015-08-19 01:46:07 +02:00
parent 5a2190c71f
commit dde566d824
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libr/core/cmd_search.c
View File

@ -869,6 +869,7 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
RList/*<intptr_t>*/ *badstart = r_list_new();
RList/*<RRegex>*/ *rx_list = NULL;
RList/*<RIOMap>*/ *list = NULL;
int align = core->search->align;
RListIter *itermap = NULL;
char* tok, *gregexp = NULL;
char* grep_arg = NULL;
@ -998,18 +999,18 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
continue;
}
if (is_end_gadget (&end_gadget, crop)) {
struct endlist_pair *epair;
if (maxhits && r_list_length (end_list) >= maxhits) {
// limit number of high level rop gadget results
break;
}
struct endlist_pair *epair = R_NEW0 (struct endlist_pair);
epair = R_NEW0 (struct endlist_pair);
// If this arch has branch delay slots, add the next instr as well
if (end_gadget.delay) {
epair->instr_offset = i+increment;
epair->delay_size = end_gadget.delay;
r_list_append(end_list, (void*)(intptr_t)epair);
}
else {
r_list_append (end_list, (void*)(intptr_t)epair);
} else {
epair->instr_offset = (intptr_t)i;
epair->delay_size = end_gadget.delay;
r_list_append (end_list, (void*)epair);
@ -1070,7 +1071,9 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
rx_list, end_gadget, badstart, &max_count);
if (!hitlist)
continue;
if (align && (0 != ((from + i) % align))) {
continue;
}
if (json) mode = 'j';
if ((mode == 'l') && subchain) {
@ -1090,7 +1093,7 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
r_list_purge (badstart);
free (buf);
}
if (r_cons_singleton()->breaked)
if (r_cons_singleton ()->breaked)
eprintf ("\n");
r_cons_break_end ();