Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] dbghelp: Detect ELF architecture before reading the whole header.

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a612f1f56fefd00ebe6d8f7bcf7c826f5aa85eab by Zebediah Figura <zfigura@codeweavers.com>
This commit is contained in:
winesync 2020-09-11 13:00:07 +02:00 committed by Jérôme Gardou
parent de68f04b7c
commit 7adbd03d5f
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dll/win32/dbghelp/elf_module.c
View file

@ -307,6 +307,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map*
char* filename;
unsigned len;
BOOL ret = FALSE;
unsigned char e_ident[EI_NIDENT];
switch (emfd->kind)
{
@ -340,14 +341,19 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map*
case from_process:
break;
}
if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0))
if (!elf_map_file_read(fmap, emfd, e_ident, sizeof(e_ident), 0))
goto done;
/* and check for an ELF header */
if (memcmp(fmap->u.elf.elfhdr.e_ident,
elf_signature, sizeof(elf_signature))) goto done;
if (memcmp(e_ident, elf_signature, sizeof(elf_signature)))
goto done;
fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32;
if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0))
goto done;
fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32;
fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0,
fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0]));
if (!fmap->u.elf.sect) goto done;

2
sdk/tools/winesync/dbghelp.cfg
View file

@ -3,4 +3,4 @@ directories:
files:
include/dbghelp.h: sdk/include/psdk/dbghelp.h
tags:
wine: c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33
wine: a612f1f56fefd00ebe6d8f7bcf7c826f5aa85eab