yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 06:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a mem-leak (#1147)

Browse source 
* fix a mem-leak.

* check the uc and l1_map before using them.

* fix multi-level free bug.

* Add pointer check.

Backports commit 79d89e5d3b83c6ee5d523738bc488d1e44b06f6a from unicorn.
This commit is contained in:
Chen Huitao 2020-01-14 09:23:18 -05:00 committed by Lioncash
parent 93720ae1f0
commit 644ea0c88c
1 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
qemu/accel/tcg/translate-all.c
View file

@ -171,24 +171,55 @@ static void cpu_gen_init(struct uc_struct *uc)
tcg_context_init(uc->tcg_ctx);
}
static void tb_clean_internal(struct uc_struct *uc, int i, void** lp)
static void tb_clean_internal(void **p, int x)
{
if (i == 0 || lp == NULL) {
return;
if (x <= 1) {
for (int i = 0; i < V_L2_SIZE; i++) {
void **q = p[i];
if (q) {
g_free(q);
}
if (lp && *lp) {
tb_clean_internal(uc, i-1, (void*)(((char*)*lp) + ((0 >> (i * V_L2_BITS)) & (V_L2_SIZE - 1))));
g_free(*lp);
}
g_free(p);
} else {
for (int i = 0; i < V_L2_SIZE; i++) {
void **q = p[i];
if (q) {
tb_clean_internal(q, x - 1);
}
}
g_free(p);
}
}
void tb_cleanup(struct uc_struct *uc)
{
int index = 0;
/* Level 1. Always allocated. */
void** lp = uc->l1_map + ((index >> uc->v_l1_shift) & (uc->v_l1_size - 1));
/* Level 2..N-1. */
tb_clean_internal(uc, uc->v_l1_shift / V_L2_BITS, lp);
if (!uc) {
return;
}
if (!uc->l1_map) {
return;
}
int x = V_L1_SHIFT / V_L2_BITS;
if (x <= 1) {
for (int i = 0; i < V_L1_SIZE; i++) {
void **p = uc->l1_map[i];
if (p) {
g_free(p);
uc->l1_map[i] = NULL;
}
}
} else {
for (int i = 0; i < V_L1_SIZE; i++) {
void **p = uc->l1_map[i];
if (p) {
tb_clean_internal(p, x - 1);
uc->l1_map[i] = NULL;
}
}
}
}
/* Encode VAL as a signed leb128 sequence at P.