Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-28 15:41:38 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix crash in ds->hint

Browse Source
This commit is contained in:
pancake 2015-09-28 11:21:23 +02:00
parent e6f01e162c
commit 3c78218da3
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/core/disasm.c
View File

@ -467,7 +467,7 @@ static void handle_deinit_ds (RCore *core, RDisasmState *ds) {
ds->oldbits = 0;
}
r_anal_op_fini (&ds->analop);
if (ds->hint) r_anal_hint_free (ds->hint);
r_anal_hint_free (ds->hint);
free (ds->comment);
free (ds->pre);
free (ds->line);
@ -596,14 +596,11 @@ static void handle_build_op_str (RCore *core, RDisasmState *ds) {
}
R_API RAnalHint *r_core_hint_begin (RCore *core, RAnalHint* hint, ut64 at) {
// XXX not here
return NULL;
static char *hint_arch = NULL;
static char *hint_syntax = NULL;
static int hint_bits = 0;
if (hint) {
r_anal_hint_free (hint);
hint = NULL;
}
r_anal_hint_free (hint);
hint = r_anal_hint_get (core->anal, at);
if (hint_arch) {
r_config_set (core->config, "asm.arch", hint_arch);
@ -2436,6 +2433,7 @@ R_API int r_core_print_disasm(RPrint *p, RCore *core, ut64 addr, ut8 *buf, int l
ds->buf = buf;
ds->len = len;
ds->addr = addr;
ds->hint = NULL;
handle_reflines_init (core->anal, ds);
core->inc = 0;

3
libr/parse/parse.c
View File

@ -15,9 +15,8 @@ static RParsePlugin *parse_static_plugins[] =
R_API RParse *r_parse_new() {
int i;
RParsePlugin *static_plugin;
RParse *p = R_NEW (RParse);
RParse *p = R_NEW0 (RParse);
if (!p) return NULL;
p->user = NULL;
p->parsers = r_list_new ();
p->parsers->free = NULL; // memleak
p->notin_flagspace = -1;