Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-06 20:48:51 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix crash on pd

Browse Source 
closes #2026
This commit is contained in:
Jeffrey Crowell 2015-02-02 18:31:51 -05:00
parent 31a557289d
commit aafea2ec4e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/core/disasm.c
View File

@ -1719,11 +1719,10 @@ static void handle_print_ptr (RCore *core, RDisasmState *ds, int len, int idx) {
/* do nothing */
} else if (((st64)p)>0) {
const char *kind;
char msg[64];
char *msg = calloc(sizeof(char), len);
RFlagItem *f;
memset (msg, 0, sizeof (msg));
r_io_read_at (core->io, p, (ut8*)msg, sizeof (msg)-1);
r_io_read_at (core->io, p, (ut8*)msg, len-1);
if (ds->analop.refptr) {
ut64 *num = (ut64*)msg;
@ -1760,7 +1759,7 @@ static void handle_print_ptr (RCore *core, RDisasmState *ds, int len, int idx) {
#if 1
if (!IS_PRINTABLE (*msg))
*msg = 0;
else msg[sizeof (msg)-1] = 0;
else msg[len-1] = 0;
#endif
f = r_flag_get_i (core->flags, p);
if (f) {
@ -1806,7 +1805,7 @@ static void handle_print_ptr (RCore *core, RDisasmState *ds, int len, int idx) {
}
}
}
kind = r_anal_data_kind (core->anal, p, (const ut8*)msg, sizeof (msg)-1);
kind = r_anal_data_kind (core->anal, p, (const ut8*)msg, len-1);
if (kind) {
if (!strcmp (kind, "text")) {
r_str_filter (msg, 0);
@ -1834,6 +1833,7 @@ static void handle_print_ptr (RCore *core, RDisasmState *ds, int len, int idx) {
// TODO: check for more data kinds
}
}
free(msg);
} else handle_print_as_string (core, ds);
}