Eric Pouech : dbghelp: Fix potential crash when loading a builtin PE module embedded in an ELF image.
Alexandre Julliard
julliard at winehq.org
Mon Nov 22 16:05:17 CST 2021
Module: wine
Branch: master
Commit: 5e56bc3b21c5955962f93c4369720964e3e05a94
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e56bc3b21c5955962f93c4369720964e3e05a94
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Nov 22 15:19:46 2021 +0100
dbghelp: Fix potential crash when loading a builtin PE module embedded in an ELF image.
Regression introduced by ced12a1a3aca214c64887e1dc65df67015015394.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbghelp/module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index fe65683c6e1..1b64bb57eb7 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -990,7 +990,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
module_remove(pcs, altmodule);
}
- if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0)
+ if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0 && !module_get_container(pcs, module))
module_load_debug(module);
return module->module.BaseOfImage;
}
More information about the wine-cvs
mailing list