Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-24 05:40:10 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix memory leaks and other problems found by ASAN. (#14980)

Browse Source
This commit is contained in:
karliss 2019-09-07 20:24:14 +03:00 committed by Anton Kochkov
parent 61f34671a6
commit 5379c70e89
14 changed files with 77 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/anal/anal.c
View File

@ -805,6 +805,7 @@ R_API void r_anal_merge_hint_ranges(RAnal *a) {
}
range_bits = bits;
}
ls_free (sdb_range);
a->merge_hints = false;
}
}

7
libr/anal/esil.c
View File

@ -1844,12 +1844,13 @@ static bool esil_poke_some(RAnalEsil *esil) {
r_anal_esil_get_parm_size (esil, foo, &tmp, &regsize);
isregornum (esil, foo, &num64);
r_write_ble (b, num64, esil->anal->big_endian, regsize);
const ut32 written = r_anal_esil_mem_write (esil, ptr, b, regsize);
if (written != regsize) {
const int size_bytes = regsize / 8;
const ut32 written = r_anal_esil_mem_write (esil, ptr, b, size_bytes);
if (written != size_bytes) {
//eprintf ("Cannot write at 0x%08" PFMT64x "\n", ptr);
esil->trap = 1;
}
ptr += regsize/8;
ptr += size_bytes;
free (foo);
}
}

21
libr/anal/fcn.c
View File

@ -728,7 +728,7 @@ static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 len, int
bool last_is_mov_lr_pc = false;
ut64 last_push_addr = UT64_MAX;
if (anal->limit && addr + idx < anal->limit->from) {
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
}
RAnalFunction *tmp_fcn = r_anal_get_fcn_in (anal, addr, 0);
if (tmp_fcn) {
@ -782,7 +782,7 @@ repeat:
if (anal->verbose) {
eprintf ("Warning: FFFF opcode at 0x%08"PFMT64x "\n", at);
}
return R_ANAL_RET_ERROR;
gotoBeach (R_ANAL_RET_ERROR)
}
r_anal_op_fini (&op);
if ((oplen = r_anal_op (anal, &op, at, buf, bytes_read, R_ANAL_OP_MASK_ESIL | R_ANAL_OP_MASK_VAL | R_ANAL_OP_MASK_HINT)) < 1) {
@ -935,7 +935,7 @@ repeat:
goto repeat;
}
if (skip_ret == 2) {
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
}
}
break;
@ -964,7 +964,7 @@ repeat:
goto repeat;
}
if (skip_ret == 2) {
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
}
}
if (anal->opt.jmptbl) {
@ -1054,7 +1054,7 @@ repeat:
goto repeat;
}
if (skip_ret == 2) {
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
}
}
}
@ -1070,7 +1070,7 @@ repeat:
}
}
if (r_cons_is_breaked ()) {
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
}
if (anal->opt.jmpref) {
(void) r_anal_xrefs_set (anal, op.addr, op.jump, R_ANAL_REF_TYPE_CODE);
@ -1175,15 +1175,14 @@ repeat:
FITFCNSZ ();
r_anal_fcn_bb (anal, fcn, op.jump, depth);
ret = r_anal_fcn_bb (anal, fcn, op.fail, depth);
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
#else
// hardcoded jmp size // must be checked at the end wtf?
// always fitfcnsz and retend
if (op.jump > fcn->addr + JMP_IS_EOB_RANGE) {
ret = r_anal_fcn_bb (anal, fcn, op.fail, depth);
/* jump inside the same function */
FITFCNSZ ();
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
#if JMP_IS_EOB_RANGE > 0
} else {
if (op.jump < addr - JMP_IS_EOB_RANGE && op.jump < addr) {
@ -1206,8 +1205,7 @@ repeat:
bb->jump = op.jump;
bb->fail = UT64_MAX;
}
FITFCNSZ ();
return R_ANAL_RET_END;
gotoBeach (R_ANAL_RET_END);
}
}
}
@ -1541,6 +1539,7 @@ R_API int r_anal_fcn(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 len, int r
case R_META_TYPE_DATA:
case R_META_TYPE_STRING:
case R_META_TYPE_FORMAT:
r_list_free (list);
return 0;
}
}

32
libr/anal/meta.c
View File

@ -444,8 +444,7 @@ static RAnalMetaItem *r_meta_find_(RAnal *a, ut64 at, int type, int where, int e
const char *infos, *metas;
char key[100];
Sdb *s = a->sdb_meta;
static RAnalMetaItem mi = {0};
// XXX: return allocated item? wtf
RAnalMetaItem *mi = NULL;
if (where != R_META_WHERE_HERE) {
eprintf ("THIS WAS NOT SUPPOSED TO HAPPEN\n");
return NULL;
@ -456,6 +455,7 @@ static RAnalMetaItem *r_meta_find_(RAnal *a, ut64 at, int type, int where, int e
if (!infos) {
return NULL;
}
mi = R_NEW0 (RAnalMetaItem);
for (; *infos; infos++) {
if (*infos == ',') {
continue;
@ -469,12 +469,13 @@ static RAnalMetaItem *r_meta_find_(RAnal *a, ut64 at, int type, int where, int e
snprintf (key, sizeof (key), "meta.%c.0x%" PFMT64x, *infos, at);
metas = sdb_const_get (s, key, 0);
if (metas) {
if (!r_meta_deserialize_val (a, &mi, *infos, at, metas)) {
if (!r_meta_deserialize_val (a, mi, *infos, at, metas)) {
continue;
}
return &mi;
return mi;
}
}
r_meta_item_free (mi);
return NULL;
}
@ -498,9 +499,12 @@ R_API RAnalMetaItem *r_meta_find_in(RAnal *a, ut64 at, int type, int where) {
r_list_foreach (list, iter, meta) {
ut64 mia = r_num_math (NULL, meta);
RAnalMetaItem *mi = r_meta_find (a, mia, type, where);
if (mi && (at >= mi->from && at < mi->to)) {
free (res);
return mi;
if (mi) {
if ((at >= mi->from && at < mi->to)) {
free (res);
return mi;
}
r_meta_item_free (mi);
}
}
r_list_free (list);
@ -514,7 +518,7 @@ R_API RList *r_meta_find_list_in(RAnal *a, ut64 at, int type, int where) {
return NULL;
}
RList *list = r_str_split_list (res, ",", 0);
RList *out = r_list_new ();
RList *out = r_list_newf (r_meta_item_free);
if (!out) {
return NULL;
}
@ -536,11 +540,13 @@ R_API RList *r_meta_find_list_in(RAnal *a, ut64 at, int type, int where) {
const char *metas = sdb_const_get (s, key, 0);
if (metas) {
RAnalMetaItem *mi = R_NEW0 (RAnalMetaItem);
if (!r_meta_deserialize_val (a, mi, *infos, mia, metas)) {
continue;
}
if (mi && (at >= mi->from && at < mi->to)) {
r_list_append (out, mi);
if (mi) {
if (r_meta_deserialize_val (a, mi, *infos, mia, metas) &&
(at >= mi->from && at < mi->to)) {
r_list_append (out, mi);
} else {
r_meta_item_free (mi);
}
}
}
}

2
libr/anal/reflines.c
View File

@ -126,7 +126,7 @@ R_API RList *r_anal_reflines_get(RAnal *anal, ut64 addr, const ut8 *buf, ut64 le
if (mi) {
ptr += mi->size;
addr += mi->size;
free (mi->str);
r_meta_item_free (mi);
continue;
}
}

7
libr/core/blaze.c
View File

@ -42,16 +42,19 @@ static int __isdata(RCore *core, ut64 addr) {
RList *list = r_meta_find_list_in (core->anal, addr, -1, 4);
RListIter *iter;
RAnalMetaItem *meta;
int result = 0;
r_list_foreach (list, iter, meta) {
switch (meta->type) {
case R_META_TYPE_DATA:
case R_META_TYPE_STRING:
case R_META_TYPE_FORMAT:
return meta->size - (addr - meta->from);
result = meta->size - (addr - meta->from);
goto exit;
}
}
exit:
r_list_free (list);
return 0;
return result;
}
static bool fcnAddBB (fcn_t *fcn, bb_t* block) {

6
libr/core/canal.c
View File

@ -898,6 +898,7 @@ static int core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int depth
break;
}
at += mi->size;
r_meta_item_free (mi);
}
// TODO: ensure next address is function after padding (nop or trap or wat)
// XXX noisy for test cases because we want to clear the stderr
@ -4874,10 +4875,13 @@ repeat:
case R_META_TYPE_STRING:
case R_META_TYPE_FORMAT:
i += 4;
r_list_free (list);
goto repeat;
}
}
r_list_free (list);
if (list) {
r_list_free (list);
}
}
/* realign address if needed */
if (opalign > 0) {

1
libr/core/citem.c
View File

@ -34,6 +34,7 @@ R_API RCoreItem *r_core_item_at (RCore *core, ut64 addr) {
ci->data = strdup (item->str);
}
}
r_meta_item_free (item);
}
}
}

1
libr/core/cmd_anal.c
View File

@ -6202,6 +6202,7 @@ static void _anal_calls(RCore *core, ut64 addr, ut64 addr_end, bool printCommand
if (hint && hint->bits) {
setBits = hint->bits;
}
r_anal_hint_free (hint);
if (setBits != core->assembler->bits) {
r_config_set_i (core->config, "asm.bits", setBits);
}

2
libr/core/cmd_meta.c
View File

@ -703,6 +703,7 @@ static int cmd_meta_others(RCore *core, const char *input) {
RAnalMetaItem *mi = r_meta_find (core->anal, addr, type, R_META_WHERE_HERE);
if (mi) {
r_meta_print (core->anal, mi, input[3], NULL, false);
r_meta_item_free (mi);
}
break;
} else if (input[2] == 'j') { // "Cs.j"
@ -710,6 +711,7 @@ static int cmd_meta_others(RCore *core, const char *input) {
if (mi) {
r_meta_print (core->anal, mi, input[2], NULL, false);
r_cons_newline ();
r_meta_item_free (mi);
}
break;
}

4
libr/core/cmd_print.c
View File

@ -1748,6 +1748,10 @@ static void annotated_hexdump(RCore *core, const char *str, int len) {
append (echars, Color_INVERT);
hadflag = true;
}
if (meta) {
r_meta_item_free (meta);
meta = NULL;
}
// collect comments
comment = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, addr + j);
if (comment) {

21
libr/core/disasm.c
View File

@ -2430,6 +2430,9 @@ static int ds_disassemble(RDisasmState *ds, ut8 *buf, int len) {
ds->oplen = sz; //ds->asmop.size;
return i;
}
if (meta) {
r_meta_item_free (meta);
}
}
if (ds->show_nodup) {
@ -2992,8 +2995,8 @@ static bool ds_print_meta_infos(RDisasmState *ds, ut8* buf, int len, int idx, in
break;
}
}
r_list_free (list);
}
r_list_free (list);
return ret;
}
@ -3442,6 +3445,9 @@ static bool ds_print_core_vmode(RDisasmState *ds, int pos) {
ds->core->assembler->bits = obits;
gotShortcut = true;
}
if (mi) {
r_meta_item_free (mi);
}
}
switch (ds->analop.type) {
case R_ANAL_OP_TYPE_UJMP:
@ -4795,6 +4801,8 @@ static void ds_print_comments_right(RDisasmState *ds) {
RAnalMetaItem *mi = r_meta_find (ds->core->anal, ds->at, R_META_TYPE_ANY, R_META_WHERE_HERE);
if (mi) {
is_code = mi->type != 'd';
r_meta_item_free (mi);
mi = NULL;
}
if (is_code && ds->asm_describe && !ds->has_description) {
char *op, *locase = strdup (r_asm_op_get_asm (&ds->asmop));
@ -6281,6 +6289,7 @@ R_API int r_core_disasm_pdi(RCore *core, int nb_opcodes, int nb_bytes, int fmt)
int midbb = r_config_get_i (core->config, "asm.bb.middle");
i = 0;
j = 0;
RAnalMetaItem *meta = NULL;
toro:
for (; pdi_check_end (nb_opcodes, nb_bytes, addrbytes * i, j); j++) {
RFlagItem *item;
@ -6288,7 +6297,12 @@ toro:
err = 1;
break;
}
RAnalMetaItem *meta = r_meta_find (core->anal, core->offset + i,
if (meta) {
// Release before write, control flow bellow is too messy to
// relase after use.
r_meta_item_free (meta);
}
meta = r_meta_find (core->anal, core->offset + i,
R_META_TYPE_ANY, R_META_WHERE_HERE);
if (meta && meta->size > 0) {
switch (meta->type) {
@ -6477,6 +6491,9 @@ toro:
i = 0;
goto toro;
}
if (meta) {
r_meta_item_free (meta);
}
r_cons_break_pop ();
r_core_seek (core, old_offset, 1);
return err;

1
libr/core/visual.c
View File

@ -2950,6 +2950,7 @@ R_API int r_core_visual_cmd(RCore *core, const char *arg) {
}
if (ami) {
r_core_seek_delta (core, ami->size);
r_meta_item_free (ami);
} else {
int distance = numbuf_pull ();
if (distance > 1) {

5
shlr/sdb/src/sdb.c
View File

@ -585,7 +585,10 @@ static ut32 sdb_set_internal(Sdb* s, const char *key, char *val, int owned, ut32
return 0;
}
if (vlen == sdbkv_value_len (kv) && !strcmp (sdbkv_value (kv), val)) {
sdb_hook_call (s, key, val);
sdb_hook_call (s, key, sdbkv_value (kv));
if (owned) {
free (val);
}
return kv->cas;
}
kv->cas = cas = nextcas ();