ntdll: Don't access empty IMAGE_FILE_IMPORT_DIRECTORY.

Signed-off-by: Kevin Puetz <PuetzKevinA@JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Don't access empty IMAGE_FILE_IMPORT_DIRECTORY.
029ec25e · Kevin Puetz · Alexandre Julliard · 9c0c0e2b · 029ec25e
Commit 029ec25e authored Nov 23, 2020 by Kevin Puetz Committed by Alexandre Julliard Nov 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

loader.c dlls/ntdll/unix/loader.c +5 -1

No files found.
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -810,11 +810,15 @@ static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module )
 {
    const IMAGE_NT_HEADERS *nt;
    const IMAGE_IMPORT_DESCRIPTOR *descr;
+    const IMAGE_DATA_DIRECTORY *dir;
    const IMAGE_THUNK_DATA *import_list;
    IMAGE_THUNK_DATA *thunk_list;

    nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew );
-    descr = get_rva( module, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress );
+    dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY];
+    if (!dir->VirtualAddress || !dir->Size) return STATUS_SUCCESS;
+
+    descr = get_rva( module, dir->VirtualAddress );
    for (; descr->Name && descr->FirstThunk; descr++)
    {
        thunk_list = get_rva( module, descr->FirstThunk );