ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Check for a 32-bit NT header before getting module address range in MODULE_GetBinaryType.

Browse Source
This commit is contained in:
Alexandre Julliard 2009-08-12 15:47:57 +02:00
parent 5e4f0cf5ca
commit 4a59ac76f1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/kernel32/module.c
View File

@ -282,7 +282,7 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end )
union union
{ {
IMAGE_OS2_HEADER os2; IMAGE_OS2_HEADER os2;
IMAGE_NT_HEADERS nt; IMAGE_NT_HEADERS32 nt;
} ext_header; } ext_header;
/* We do have a DOS image so we will now try to seek into /* We do have a DOS image so we will now try to seek into
@ -311,7 +311,18 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end )
if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase;
if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase +
ext_header.nt.OptionalHeader.SizeOfImage); ext_header.nt.OptionalHeader.SizeOfImage);
return ret; switch (ext_header.nt.OptionalHeader.Magic)
{
case IMAGE_NT_OPTIONAL_HDR32_MAGIC:
if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase;
if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase +
ext_header.nt.OptionalHeader.SizeOfImage);
return ret;
case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
if (res_start) *res_start = NULL;
if (res_end) *res_end = NULL;
return ret;
}
} }
return BINARY_DOS; return BINARY_DOS;
} }