yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a memory leak due to wrong free order

Browse Source
This commit is contained in:
lazymio
2021-10-06 10:11:04 +02:00
parent db821ad005
commit 76a1b4661c
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qemu/softmmu/memory.c
View File

@ -786,12 +786,23 @@ static void address_space_update_topology_pass(AddressSpace *as,
static void flatviews_init(struct uc_struct *uc) static void flatviews_init(struct uc_struct *uc)
{ {
static FlatView *empty_view;
if (uc->flat_views) { if (uc->flat_views) {
return; return;
} }
uc->flat_views = g_hash_table_new_full(NULL, NULL, NULL, uc->flat_views = g_hash_table_new_full(NULL, NULL, NULL,
(GDestroyNotify) flatview_unref); (GDestroyNotify) flatview_unref);
if (!empty_view) {
empty_view = generate_memory_topology(uc, NULL);
/* We keep it alive forever in the global variable. */
flatview_ref(empty_view);
} else {
g_hash_table_replace(uc->flat_views, NULL, empty_view);
flatview_ref(empty_view);
}
} }
static void flatviews_reset(struct uc_struct *uc) static void flatviews_reset(struct uc_struct *uc)

10
uc.c
View File

@ -339,6 +339,11 @@ uc_err uc_close(uc_engine *uc)
/* cpu */ /* cpu */
free(uc->cpu); free(uc->cpu);
/* flatviews */
g_hash_table_destroy(uc->flat_views);
// During flatviews destruction, we may still access memory regions.
// So we free them afterwards.
/* memory */ /* memory */
mr = &uc->io_mem_unassigned; mr = &uc->io_mem_unassigned;
mr->destructor(mr); mr->destructor(mr);
@ -347,10 +352,7 @@ uc_err uc_close(uc_engine *uc)
mr = uc->system_memory; mr = uc->system_memory;
mr->destructor(mr); mr->destructor(mr);
g_free(uc->system_memory); g_free(uc->system_memory);
//g_free(uc->system_io); g_free(uc->system_io);
/* flatviews */
g_hash_table_destroy(uc->flat_views);
// Thread relateds. // Thread relateds.
if (uc->qemu_thread_data) { if (uc->qemu_thread_data) {