Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-04 04:17:25 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix: omn wasn't expecting an id (#9662)

Browse Source
This commit is contained in:
Oscar Salvador 2018-03-12 12:33:03 +01:00 committed by radare
parent 2b7afb9264
commit b5fa54eba7
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libr/core/cmd_open.c
View File

@ -93,7 +93,8 @@ static const char *help_msg_om[] = {
"om", " fd vaddr [size] [paddr] [rwx] [name]", "create new io map",
"omm"," [fd]", "create default map for given fd. (omm `oq`)",
"om.", "", "show map, that is mapped to current offset",
"omn", " mapid [name]", "set/delete name for map with mapid",
"omn", " mapaddr [name]", "set/delete name for map which spans mapaddr",
"omni", " mapid [name]", "set/delete name for map with mapid",
"omn.", "([-|name])", "show/set/delete name for current map",
"omf", " [mapid] rwx", "change flags/perms for current/given map",
"omfg", "[+-]rwx", "change flags/perms for all maps (global)",
@ -537,6 +538,7 @@ static void cmd_omf (RCore *core, const char *input) {
static void cmd_open_map(RCore *core, const char *input) {
ut64 fd = 0LL;
ut32 id = 0;
ut64 addr = 0;
char *s = NULL, *p = NULL, *q = NULL;
ut64 new;
RIOMap *map = NULL;
@ -678,10 +680,13 @@ static void cmd_open_map(RCore *core, const char *input) {
}
}
} else {
if (!(s = strdup (&input[2]))) {
bool use_id = (input[2] == 'i') ? true : false;
s = strdup ( use_id ? &input[3] : &input[2]);
if (!s) {
break;
}
p = s;
while (*s == ' ') {
s++;
}
@ -690,16 +695,26 @@ static void cmd_open_map(RCore *core, const char *input) {
break;
}
if (!(q = strchr (s, ' '))) {
id = (ut32)r_num_math (core->num, s);
map = r_io_map_get (core->io, id);
if (use_id) {
id = (ut32)r_num_math (core->num, s);
map = r_io_map_resolve (core->io, id);
} else {
addr = r_num_math (core->num, s);
map = r_io_map_get (core->io, addr);
}
r_io_map_del_name (map);
s = p;
break;
}
*q = '\0';
q++;
id = (ut32)r_num_math (core->num, s);
map = r_io_map_get (core->io, id);
if (use_id) {
id = (ut32)r_num_math (core->num, s);
map = r_io_map_resolve (core->io, id);
} else {
addr = r_num_math (core->num, s);
map = r_io_map_get (core->io, addr);
}
if (*q) {
r_io_map_set_name (map, q);
} else {