[PATCH 3/3] dbghelp: Use correct destination buffer length when initializing module data
Nikolay Sivov
nsivov at codeweavers.com
Tue Jan 30 07:46:30 CST 2018
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
Previous patch takes care of A-structs, this one fixes actual wide strings.
dlls/dbghelp/module.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 9256a8f932..6c7f2dcb6d 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -100,7 +100,8 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size)
void module_set_module(struct module* module, const WCHAR* name)
{
- module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName));
+ module_fill_module(name, module->module.ModuleName,
+ sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0]));
}
const WCHAR *get_wine_loader_name(void)
@@ -910,7 +911,7 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess,
if (!GetModuleInformation(hProcess, hMods[i], &mi, sizeof(mi)) ||
!GetModuleBaseNameW(hProcess, hMods[i], baseW, sizeof(baseW) / sizeof(WCHAR)))
continue;
- module_fill_module(baseW, modW, sizeof(modW) / sizeof(CHAR));
+ module_fill_module(baseW, modW, sizeof(modW) / sizeof(modW[0]));
EnumLoadedModulesCallback(modW, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage,
UserContext);
}
--
2.15.1
More information about the wine-devel
mailing list