From 6018064d599ca0a797ab47b2d3272e2f98860f52 Mon Sep 17 00:00:00 2001 From: Ralf Habacker <ralf.habacker@freenet.de> Date: Tue, 10 Nov 2015 19:22:03 +0100 Subject: [PATCH] dbghelp: Fix crash in module_find_cb on trying to parse non image files. Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de> Signed-off-by: Marcus Meissner <marcus@jet.franken.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org> --- dlls/dbghelp/path.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index a0e51bd4f36..8c74426eec3 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -490,7 +490,13 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) { IMAGE_NT_HEADERS* nth = RtlImageNtHeader(mapping); - + if (!nth) + { + UnmapViewOfFile(mapping); + CloseHandle(hMap); + CloseHandle(hFile); + return FALSE; + } matched++; timestamp = nth->FileHeader.TimeDateStamp; size = nth->OptionalHeader.SizeOfImage; -- GitLab