system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

ntdll: Do not fail to relocate an image if the size of relocation block is 0.

Browse source
This commit is contained in:
Dmitry Timoshkov 2015-08-20 13:08:07 +08:00 committed by Alexandre Julliard
parent 3b5107d063
commit 7386de357f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/ntdll/loader.c
View file

@ -1680,14 +1680,16 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len )
relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];
if ((nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) ||
!relocs->VirtualAddress || !relocs->Size)
if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
{
WARN( "Need to relocate module from %p to %p, but there are no relocation records\n",
base, module );
return STATUS_CONFLICTING_ADDRESSES;
}
if (!relocs->Size) return STATUS_SUCCESS;
if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES;
if (nt->FileHeader.NumberOfSections > sizeof(protect_old)/sizeof(protect_old[0]))
return STATUS_INVALID_IMAGE_FORMAT;