mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-24 15:58:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix uc_mem_unmap memory leak and in uc_close.

Browse source 
It appears the problem is that we are not calling the memory region
destructor. After modifying memory_unmap to include the destructor call
for the memory region, the memory is freed.

Furthermore in uc_close we must explicitly free any blocks that were not
unmapped by the user to prevent leaks.

This should fix issue 305.
This commit is contained in:
farmdve 2015-12-11 02:42:31 +02:00
parent 9d7f81d195
commit 3e57615c76
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/memory.c
View file

@ -68,6 +68,11 @@ void memory_unmap(struct uc_struct *uc, MemoryRegion *mr)
uc->mapped_block_count--; uc->mapped_block_count--;
//shift remainder of array down over deleted pointer //shift remainder of array down over deleted pointer
memcpy(&uc->mapped_blocks[i], &uc->mapped_blocks[i + 1], sizeof(MemoryRegion*) * (uc->mapped_block_count - i)); memcpy(&uc->mapped_blocks[i], &uc->mapped_blocks[i + 1], sizeof(MemoryRegion*) * (uc->mapped_block_count - i));
mr->destructor(mr);
if((char *)mr->name)
g_free((char *)mr->name);
if(mr->ioeventfds)
g_free(mr->ioeventfds);
break; break;
} }
} }

13
uc.c
View file

@ -258,6 +258,9 @@ uc_err uc_open(uc_arch arch, uc_mode mode, uc_engine **result)
UNICORN_EXPORT UNICORN_EXPORT
uc_err uc_close(uc_engine *uc) uc_err uc_close(uc_engine *uc)
{ {
MemoryRegion *mr;
int i;
if (uc->release) if (uc->release)
uc->release(uc->tcg_ctx); uc->release(uc->tcg_ctx);
@ -271,11 +274,19 @@ uc_err uc_close(uc_engine *uc)
g_free(uc->tcg_ctx); g_free(uc->tcg_ctx);
for (i = 0; i < uc->mapped_block_count; i++) {
mr = uc->mapped_blocks[i];
mr->destructor(mr);
if((char *)mr->name)
g_free((char *)mr->name);
if(mr->ioeventfds)
g_free(mr->ioeventfds);
}
free((void*) uc->system_memory->name); free((void*) uc->system_memory->name);
g_free(uc->system_memory); g_free(uc->system_memory);
g_hash_table_destroy(uc->type_table); g_hash_table_destroy(uc->type_table);
int i;
for (i = 0; i < DIRTY_MEMORY_NUM; i++) { for (i = 0; i < DIRTY_MEMORY_NUM; i++) {
free(uc->ram_list.dirty_memory[i]); free(uc->ram_list.dirty_memory[i]);
} }