[PATCH v2 0/1] MR3016: dbghelp: Allocate real_path with the CRT and copy it to the module heap.
Fixes both a memory leak and an alloc/free mismatch, and the module heap is the most appropriate place to hold the variable long-term. -- v2: dbghelp: Allocate real_path with the CRT and copy it to the module heap. https://gitlab.winehq.org/wine/wine/-/merge_requests/3016
From: Alex Henrie <alexhenrie24(a)gmail.com> Fixes both a memory leak and an alloc/free mismatch, and the module heap is the most appropriate place to hold the variable long-term. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 1 - dlls/dbghelp/pe_module.c | 12 +++++------- dlls/dbghelp/storage.c | 7 +++++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 7ba10447771..b74c83eb977 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -44,6 +44,7 @@ void pool_destroy(struct pool* a) DECLSPEC_HIDDEN; void* pool_alloc(struct pool* a, size_t len) __WINE_ALLOC_SIZE(2) __WINE_MALLOC DECLSPEC_HIDDEN; void* pool_realloc(struct pool* a, void* ptr, size_t len) __WINE_ALLOC_SIZE(3) DECLSPEC_HIDDEN; char* pool_strdup(struct pool* a, const char* str) __WINE_MALLOC DECLSPEC_HIDDEN; +WCHAR* pool_wcsdup(struct pool* a, const WCHAR* str) __WINE_MALLOC DECLSPEC_HIDDEN; struct vector { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index bae4a77f16e..1493d3006cc 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1068,7 +1068,6 @@ BOOL module_remove(struct process* pcs, struct module* module) hash_table_destroy(&module->ht_types); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); - HeapFree(GetProcessHeap(), 0, module->real_path); pool_destroy(&module->pool); /* native dbghelp doesn't invoke registered callback(,CBA_SYMBOLS_UNLOADED,) here * so do we diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 7aeb1cf8901..10865a06f5b 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -760,13 +760,10 @@ struct builtin_search static BOOL search_builtin_pe(void *param, HANDLE handle, const WCHAR *path) { struct builtin_search *search = param; - size_t size; if (!pe_map_file(handle, &search->fmap, DMT_PE)) return FALSE; - size = (lstrlenW(path) + 1) * sizeof(WCHAR); - if ((search->path = heap_alloc(size))) - memcpy(search->path, path, size); + search->path = wcsdup(path); return TRUE; } @@ -819,7 +816,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, if (name) lstrcpyW(loaded_name, name); } if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) - return NULL; + goto done; modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { @@ -841,7 +838,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine); if (module) { - module->real_path = real_path; + module->real_path = real_path ? pool_wcsdup(&module->pool, real_path) : NULL; modfmt->module = module; modfmt->remove = pe_module_remove; modfmt->loc_compute = NULL; @@ -851,7 +848,6 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else { ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - heap_free(real_path); image_unmap_file(&modfmt->u.pe_info->fmap); } } @@ -859,6 +855,8 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, if (opened) CloseHandle(hFile); +done: + free(real_path); return module; } diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index daed3aa8d99..038b625cf1c 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -55,6 +55,13 @@ char* pool_strdup(struct pool* pool, const char* str) return ret; } +WCHAR* pool_wcsdup(struct pool* pool, const WCHAR* str) +{ + WCHAR* ret; + if ((ret = pool_alloc(pool, (wcslen(str) + 1) * sizeof(WCHAR)))) wcscpy(ret, str); + return ret; +} + void vector_init(struct vector* v, unsigned esz, unsigned bucket_sz) { v->buckets = NULL; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3016
On Sun Jun 11 07:15:29 2023 +0000, eric pouech wrote:
actually, the best way would be to use the pool_ helpers (each module (DLL with debug info avail) in dbghelp has its own heap, where are stored objects which life time is the one of the module: the main benefit is that the objects are not deallocated one by one, but the heap is destroyed when the module is unloaded) the real_path is just another attribute of the module, so allocating inside the module's pool is the best option you may have to implement pool_wcsdup though, add the module to struct build_search and remove the deallocation of real_path in module_remove Because module->pool is not available until after search_builtin_pe has run, I think it would be easiest to allocate real_path with the CRT in all cases and then free it right after making a copy of it on the module heap. Could you take a look at v2 of this merge request and approve?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3016#note_36744
eric pouech (@epo) commented about dlls/dbghelp/pe_module.c:
if (name) lstrcpyW(loaded_name, name); } if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) - return NULL; + goto done;
I'd rather avoid the goto, and most importantly you don't close the file handle. perhaps ``` modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)); if (modfmt) { ... } if (!module) HeapFree(...) ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3016#note_36749
participants (3)
-
Alex Henrie -
Alex Henrie (＠alexhenrie)
-
eric pouech (＠epo)