Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-10 08:14:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix issue #4319 can not use regex sequence in rop

Browse Source
This commit is contained in:
easyhard 2016-03-15 22:13:53 +08:00 committed by pancake
parent 8a45a43a86
commit ddaa6dff07
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libr/core/cmd_search.c
View File

@ -672,7 +672,7 @@ static RList* construct_rop_gadget(RCore *core, ut64 addr, ut8 *buf, int idx,
bool valid = false;
int grep_find;
int search_hit;
RRegex* rx = NULL;
char* rx = NULL;
RList /*<intptr_t>*/ *localbadstart = r_list_new();
RListIter *iter;
void* p;
@ -724,7 +724,7 @@ static RList* construct_rop_gadget(RCore *core, ut64 addr, ut8 *buf, int idx,
addr += asmop.size;
if (rx) {
//grep_find = r_regex_exec (rx, asmop.buf_asm, 0, 0, 0);
grep_find = !r_regex_match (grep, "e", asmop.buf_asm);
grep_find = !r_regex_match (rx, "e", asmop.buf_asm);
search_hit = (end && grep && (grep_find < 1));
} else {
search_hit = (end && grep && strstr (asmop.buf_asm, grep_str));
@ -931,7 +931,7 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
char* tok, *gregexp = NULL;
char* grep_arg = NULL;
bool json_first = true;
RRegex* rx = NULL;
char *rx = NULL;
int delta = 0;
ut8 *buf;
RIOMap *map;
@ -983,7 +983,7 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
gregexp = strdup (grep);
tok = strtok (gregexp, ";");
while (tok) {
rx = r_regex_new (tok, "");
rx = strdup (tok);
r_list_append (rx_list, rx);
tok = strtok (NULL, ";");
}