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

Fix leaks in canal.c, xrefs and disasm

Browse Source
This commit is contained in:
Fangrui Song 2017-08-09 02:31:37 -07:00 committed by radare
parent f5a03ce8c1
commit 8544f4a953
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/anal/xrefs.c
View File

@ -116,7 +116,7 @@ R_API int r_anal_xrefs_from (RAnal *anal, RList *list, const char *kind, const R
}
R_API RList *r_anal_xrefs_get (RAnal *anal, ut64 to) {
RList *list = r_list_new ();
RList *list = r_list_newf (r_anal_ref_free);
if (!list) {
return NULL;
}
@ -133,7 +133,7 @@ R_API RList *r_anal_xrefs_get (RAnal *anal, ut64 to) {
}
R_API RList *r_anal_refs_get (RAnal *anal, ut64 from) {
RList *list = r_list_new ();
RList *list = r_list_newf (r_anal_ref_free);
if (!list) {
return NULL;
}

45
libr/core/canal.c
View File

@ -3506,17 +3506,12 @@ static void getpcfromstack(RCore *core, RAnalEsil *esil) {
r_io_read_at (core->io, addr, buf, size + 1);
// Hardcoding for 2 instructions (mov e_p,[esp];ret). More work needed
// TODO Hardcoding for 2 instructions (mov e_p,[esp];ret). More work needed
idx = 0;
r_anal_op_fini (&op);
if (!r_anal_op (core->anal, &op, cur, buf + idx, size - idx)) {
free (buf);
return;
}
if (op.size < 1 || (op.type != R_ANAL_OP_TYPE_MOV && op.type != R_ANAL_OP_TYPE_CMOV)) {
free (buf);
return;
if (r_anal_op (core->anal, &op, cur, buf + idx, size - idx) <= 0 ||
op.size <= 0 ||
(op.type != R_ANAL_OP_TYPE_MOV && op.type != R_ANAL_OP_TYPE_CMOV)) {
goto err_anal_op;
}
r_asm_set_pc (core->assembler, cur);
@ -3526,21 +3521,18 @@ static void getpcfromstack(RCore *core, RAnalEsil *esil) {
// This is a hack, since ESIL doesn't always preserve values pushed on the stack. That probably needs to be rectified
spname = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
if (!spname || !*spname) {
free (buf);
return;
goto err_anal_op;
}
tmp_esil_str_len = strlen (esilstr) + strlen (spname) + maxaddrlen;
tmp_esil_str = (char*) malloc (tmp_esil_str_len);
tmp_esil_str[tmp_esil_str_len - 1] = '\0';
if (!tmp_esil_str) {
free (buf);
return;
goto err_anal_op;
}
snprintf (tmp_esil_str, tmp_esil_str_len - 1, "%s,[", spname);
if (!esilstr || !*esilstr || (strncmp ( esilstr, tmp_esil_str, strlen (tmp_esil_str)))) {
free (buf);
free (tmp_esil_str);
return;
free (tmp_esil_str);
goto err_anal_op;
}
snprintf (tmp_esil_str, tmp_esil_str_len - 1, "%20" PFMT64u "%s", esil_cpy.old, &esilstr[strlen (spname) + 4]);
@ -3553,27 +3545,26 @@ static void getpcfromstack(RCore *core, RAnalEsil *esil) {
cur = addr + idx;
r_anal_op_fini (&op);
if (!r_anal_op (core->anal, &op, cur, buf + idx, size - idx)) {
free (buf);
return;
}
if (op.size < 1 || (op.type != R_ANAL_OP_TYPE_RET && op.type != R_ANAL_OP_TYPE_CRET)) {
free (buf);
return;
if (r_anal_op (core->anal, &op, cur, buf + idx, size - idx) <= 0 ||
op.size <= 0 ||
(op.type != R_ANAL_OP_TYPE_RET && op.type != R_ANAL_OP_TYPE_CRET)) {
goto err_anal_op;
}
r_asm_set_pc (core->assembler, cur);
esilstr = R_STRBUF_SAFEGET (&op.esil);
r_anal_esil_set_pc (&esil_cpy, cur);
if (!esilstr || !*esilstr) {
free (buf);
return;
goto err_anal_op;
}
r_anal_esil_parse (&esil_cpy, esilstr);
r_anal_esil_stack_free (&esil_cpy);
free (buf);
memcpy (esil, &esil_cpy, sizeof (esil_cpy));
err_anal_op:
r_anal_op_fini (&op);
free (buf);
}
R_API void r_core_anal_esil(RCore *core, const char *str, const char *target) {

3
libr/core/disasm.c
View File

@ -731,6 +731,7 @@ static void ds_build_op_str(RDisasmState *ds) {
break;
}
}
r_list_free (list);
}
}
char *asm_str = colorize_asm_string (core, ds);
@ -2770,6 +2771,7 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
}
}
}
r_list_free (list);
bool flag_printed = false;
bool refaddr_printed = false;
bool string_printed = false;
@ -4875,6 +4877,7 @@ R_API int r_core_disasm_pdi(RCore *core, int nb_opcodes, int nb_bytes, int fmt)
r_cons_printf ("%s%s"Color_RESET "\n",
r_print_color_op_type (core->print, aop.type),
asm_str);
r_anal_op_fini (&aop);
} else {
r_cons_println (asm_str);
}