system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 21:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid going past the end of the relocation section. Skip sanity checks

Browse source 
for empty relocation blocks.
This commit is contained in:
Alexandre Julliard 2000-08-16 12:46:09 +00:00
parent 587cc122dc
commit a257ba245a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
loader/pe_image.c
View file

@ -421,11 +421,14 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
if ((nt->OptionalHeader.ImageBase & 0x80000000) && !((DWORD)base & 0x80000000))
ERR( "Forced to relocate system DLL (base > 2GB). This is not good.\n" );
while (rel->VirtualAddress)
for ( ; ((char *)rel < base + dir->VirtualAddress + dir->Size) && rel->VirtualAddress;
rel = (IMAGE_BASE_RELOCATION*)((char*)rel + rel->SizeOfBlock))
{
char *page = base + rel->VirtualAddress;
int i, count = (rel->SizeOfBlock - 8) / sizeof(rel->TypeOffset);
if (!count) continue;
/* sanity checks */
if ((char *)rel + rel->SizeOfBlock > base + dir->VirtualAddress + dir->Size ||
page > base + nt->OptionalHeader.SizeOfImage)
@ -462,7 +465,6 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
break;
}
}
rel = (IMAGE_BASE_RELOCATION*)((char*)rel + rel->SizeOfBlock);
}
return 1;
}