[PATCH 0/1] MR978: kernelbase: Fix uninitialized return value in GetModuleHandleA().
GCC (MingW) 12.2 rightfully warns with: /home/eric/work/wine/dlls/kernelbase/loader.c: In function 'GetModuleHandleA': /home/eric/work/wine/dlls/kernelbase/loader.c:332:12: warning: 'ret' may be used uninitialized [-Wmaybe-uninitialized] 332 | return ret; | ^~~ /home/eric/work/wine/dlls/kernelbase/loader.c:329:13: note: 'ret' declared here 329 | HMODULE ret; | ^~~ So set module to NULL on all error codepaths in GetModuleHandleExA(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/978
From: Eric Pouech <eric.pouech(a)gmail.com> GCC (MingW) 12.2 rightfully warns with: /home/eric/work/wine/dlls/kernelbase/loader.c: In function 'GetModuleHandleA': /home/eric/work/wine/dlls/kernelbase/loader.c:332:12: warning: 'ret' may be used uninitialized [-Wmaybe-uninitialized] 332 | return ret; | ^~~ /home/eric/work/wine/dlls/kernelbase/loader.c:329:13: note: 'ret' declared here 329 | HMODULE ret; | ^~~ So set module to NULL on all error codepaths in GetModuleHandleExA(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/loader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 0fd2d7b7c99..685cd1a1361 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -355,7 +355,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExA( DWORD flags, LPCSTR name, HMOD if (!name || (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) return GetModuleHandleExW( flags, (LPCWSTR)name, module ); - if (!(nameW = file_name_AtoW( name, FALSE ))) return FALSE; + if (!(nameW = file_name_AtoW( name, FALSE ))) + { + if (module) *module = NULL; + return FALSE; + } return GetModuleHandleExW( flags, nameW, module ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/978
This merge request was closed by eric pouech. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/978
participants (2)
-
Eric Pouech -
eric pouech (＠epo)