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>

dbghelp: Fix crash in module_find_cb on trying to parse non image files.
6018064d · Ralf Habacker · Alexandre Julliard · 61c49bd7 · 6018064d
Commit 6018064d authored Nov 10, 2015 by Ralf Habacker Committed by Alexandre Julliard Nov 11, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

path.c dlls/dbghelp/path.c +7 -1

No files found.
--- 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;