Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-14 08:49:50 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix search range of /x

Browse Source
This commit is contained in:
Fangrui Song 2017-09-16 00:23:10 -07:00 committed by radare
parent 2defeea47d
commit b2d5fac55c
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libr/core/cmd_search.c
View File

@ -1854,12 +1854,6 @@ static void do_string_search(RCore *core, RAddrInterval search_itv, struct searc
if (r_cons_is_breaked ()) {
break;
}
if (r_itv_end (map->itv) < map->itv.addr) {
eprintf ("invalid from/to values\n");
break;
}
r_io_use_fd (core->io, map->fd);
if (!json) {
RSearchKeyword *kw = r_list_first (core->search->kws);
eprintf ("Searching %d bytes in [0x%"PFMT64x "-0x%"PFMT64x "]\n",
@ -1872,18 +1866,18 @@ static void do_string_search(RCore *core, RAddrInterval search_itv, struct searc
if (param->bckwrds) {
if (itv.size <= bufsz) {
at = map->itv.addr;
at = itv.addr;
param->do_bckwrd_srch = false;
} else {
at = r_itv_end (map->itv) - bufsz;
at = r_itv_end (itv) - bufsz;
}
} else {
at = map->itv.addr;
at = itv.addr;
}
/* bckwrds = false -> normal search -> must be at < to
bckwrds search -> check later */
for (; (!param->bckwrds && at < r_itv_end (map->itv)) || param->bckwrds;) {
print_search_progress (at, r_itv_end (map->itv), searchhits);
for (; (!param->bckwrds && at < r_itv_end (itv)) || param->bckwrds;) {
print_search_progress (at, r_itv_end (itv), searchhits);
if (r_cons_is_breaked ()) {
eprintf ("\n\n");
break;
@ -1921,10 +1915,10 @@ static void do_string_search(RCore *core, RAddrInterval search_itv, struct searc
param->do_bckwrd_srch = false;
bufsz = at;
at = 0;
} else if (at - bufsz < map->itv.addr) {
} else if (at - bufsz < itv.addr) {
param->do_bckwrd_srch = false;
bufsz = at - map->itv.addr;
at = map->itv.addr;
bufsz = at - itv.addr;
at = itv.addr;
} else {
at -= bufsz;
}
@ -2774,7 +2768,7 @@ reread:
r_core_cmd_help (core, help_msg_slash_x);
} else {
RSearchKeyword *kw;
char *s, *p = strdup (input + json + 2);
char *s, *p = strdup (input + param_offset);
r_search_reset (core->search, R_SEARCH_KEYWORD);
r_search_set_distance (core->search, (int)r_config_get_i (core->config, "search.distance"));
s = strchr (p, ':');

2
libr/include/r_util/r_addr_interval.h
View File

@ -41,7 +41,7 @@ static inline bool r_itv_overlap2(RAddrInterval itv, ut64 addr, ut64 size) {
// Precondition: itv and x overlap
// Returns the intersection of itv and x
static inline RAddrInterval r_itv_intersect(RAddrInterval itv, RAddrInterval x) {
ut64 addr = R_MIN (itv.addr, x.addr),
ut64 addr = R_MAX (itv.addr, x.addr),
end = R_MIN (itv.addr + itv.size - 1, x.addr + x.size - 1) + 1;
return (RAddrInterval){addr, end - addr};
}