diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index eb0471cc8ee..2f078a00a10 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1102,6 +1102,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { + void *ptr = (void *)((ULONG_PTR)hLibModule & ~3); + if (!RtlImageNtHeader( ptr )) + { + SetLastError( ERROR_BAD_EXE_FORMAT ); + return FALSE; + } if ((ULONG_PTR)hLibModule & 1) { struct exclusive_datafile *file; @@ -1119,7 +1125,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) } LdrUnlockLoaderLock( 0, magic ); } - return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); + return UnmapViewOfFile( ptr ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 3e077f38a93..c059b988bf9 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -429,6 +429,11 @@ static void testLoadLibraryEx(void) hmodule = LoadLibraryExA("comctl32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule != 0, "Expected valid module handle\n"); + SetLastError(0xdeadbeef); + ret = FreeLibrary( (HMODULE)((ULONG_PTR)hmodule + 0x1230)); + ok(!ret, "Free succeeded on wrong handle\n"); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = FreeLibrary(hmodule); ok(ret, "Expected to be able to free the module, failed with %d\n", GetLastError());