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

dbghelp/dwarf: Properly parse 32 vs bit 64bit entities. 

Store the offset_size in dwarf2_cuhead_t.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2021-09-11 10:58:53 +02:00 committed by Alexandre Julliard
parent 92b3f1bf2a
commit d78c09aa37
2 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dlls/dbghelp/dwarf.c
View File

@ -170,6 +170,7 @@ typedef struct dwarf2_cuhead_s
{ {
unsigned char word_size; /* size of a word on target machine */ unsigned char word_size; /* size of a word on target machine */
unsigned char version; unsigned char version;
unsigned char offset_size; /* size of offset inside DWARF */
} dwarf2_cuhead_t; } dwarf2_cuhead_t;
typedef struct dwarf2_parse_context_s typedef struct dwarf2_parse_context_s
@ -362,6 +363,25 @@ static inline ULONG_PTR dwarf2_parse_addr_head(dwarf2_traverse_context_t* ctx, c
return dwarf2_parse_addr(ctx, head->word_size); return dwarf2_parse_addr(ctx, head->word_size);
} }
static ULONG_PTR dwarf2_parse_offset(dwarf2_traverse_context_t* ctx, unsigned char offset_size)
{
ULONG_PTR ret = dwarf2_get_addr(ctx->data, offset_size);
ctx->data += offset_size;
return ret;
}
static ULONG_PTR dwarf2_parse_3264(dwarf2_traverse_context_t* ctx, unsigned char* ofsz)
{
ULONG_PTR ret = dwarf2_parse_u4(ctx);
if (ret == 0xffffffff)
{
ret = dwarf2_parse_u8(ctx);
*ofsz = 8;
}
else *ofsz = 4;
return ret;
}
static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ctx) static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ctx)
{ {
return wine_dbg_sprintf("ctx(%p)", ctx->data); return wine_dbg_sprintf("ctx(%p)", ctx->data);
@ -2159,6 +2179,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections,
unsigned insn_size, default_stmt; unsigned insn_size, default_stmt;
unsigned line_range, opcode_base; unsigned line_range, opcode_base;
int line_base; int line_base;
unsigned char offset_size;
const unsigned char* opcode_len; const unsigned char* opcode_len;
struct vector dirs; struct vector dirs;
struct vector files; struct vector files;
@ -2174,18 +2195,23 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections,
return FALSE; return FALSE;
} }
traverse.data = sections[section_line].address + offset; traverse.data = sections[section_line].address + offset;
traverse.end_data = traverse.data + 4; traverse.end_data = sections[section_line].address + sections[section_line].size;
length = dwarf2_parse_u4(&traverse); length = dwarf2_parse_3264(&traverse, &offset_size);
traverse.end_data = sections[section_line].address + offset + length; if (offset_size != ctx->head.offset_size)
{
WARN("Mismatch in 32/64 bit format\n");
return FALSE;
}
traverse.end_data = traverse.data + length;
if (offset + 4 + length > sections[section_line].size) if (traverse.end_data > sections[section_line].address + sections[section_line].size)
{ {
WARN("out of bounds header\n"); WARN("out of bounds header\n");
return FALSE; return FALSE;
} }
dwarf2_parse_u2(&traverse); /* version */ dwarf2_parse_u2(&traverse); /* version */
dwarf2_parse_u4(&traverse); /* header_len */ dwarf2_parse_offset(&traverse, offset_size); /* header_len */
insn_size = dwarf2_parse_byte(&traverse); insn_size = dwarf2_parse_byte(&traverse);
default_stmt = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse);
line_base = (signed char)dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse);
@ -2375,12 +2401,13 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections,
/* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */
static LONG max_supported_dwarf_version = 0; static LONG max_supported_dwarf_version = 0;
cu_length = dwarf2_parse_u4(mod_ctx); cu_length = dwarf2_parse_3264(mod_ctx, &ctx.head.offset_size);
cu_ctx.data = mod_ctx->data; cu_ctx.data = mod_ctx->data;
cu_ctx.end_data = mod_ctx->data + cu_length; cu_ctx.end_data = mod_ctx->data + cu_length;
mod_ctx->data += cu_length; mod_ctx->data += cu_length;
ctx.head.version = dwarf2_parse_u2(&cu_ctx); ctx.head.version = dwarf2_parse_u2(&cu_ctx);
cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx.head.offset_size);
ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); ctx.head.word_size = dwarf2_parse_byte(&cu_ctx);
TRACE("Compilation Unit Header found at 0x%x:\n", TRACE("Compilation Unit Header found at 0x%x:\n",
@ -2389,6 +2416,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections,
TRACE("- version: %u\n", ctx.head.version); TRACE("- version: %u\n", ctx.head.version);
TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset);
TRACE("- word_size: %u\n", ctx.head.word_size); TRACE("- word_size: %u\n", ctx.head.word_size);
TRACE("- offset_size: %u\n", ctx.head.offset_size);
if (max_supported_dwarf_version == 0) if (max_supported_dwarf_version == 0)
{ {
@ -2727,13 +2755,13 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt
const unsigned char* ptr_blk; const unsigned char* ptr_blk;
const unsigned char* cie_ptr; const unsigned char* cie_ptr;
const unsigned char* last_cie_ptr = (const unsigned char*)~0; const unsigned char* last_cie_ptr = (const unsigned char*)~0;
unsigned len, id; ULONG_PTR len, id;
ULONG_PTR start, range; ULONG_PTR start, range;
unsigned cie_id; ULONG_PTR cie_id;
const BYTE* start_data = fde_ctx->data; const BYTE* start_data = fde_ctx->data;
unsigned char word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; unsigned char word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size;
unsigned char offset_size;
cie_id = in_eh_frame ? 0 : DW_CIE_ID;
/* skip 0-padding at beginning of section (alignment) */ /* skip 0-padding at beginning of section (alignment) */
while (fde_ctx->data + 2 * 4 < fde_ctx->end_data) while (fde_ctx->data + 2 * 4 < fde_ctx->end_data)
{ {
@ -2745,14 +2773,15 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt
} }
for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk) for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk)
{ {
const unsigned char* st = fde_ctx->data;
/* find the FDE for address addr (skip CIE) */ /* find the FDE for address addr (skip CIE) */
len = dwarf2_parse_u4(fde_ctx); len = dwarf2_parse_3264(fde_ctx, &offset_size);
if (len == 0xffffffff) FIXME("Unsupported yet 64-bit CIEs\n"); cie_id = in_eh_frame ? 0 : (offset_size == 4 ? DW_CIE_ID : (ULONG_PTR)DW64_CIE_ID);
ptr_blk = fde_ctx->data + len; ptr_blk = fde_ctx->data + len;
id = dwarf2_parse_u4(fde_ctx); id = dwarf2_parse_offset(fde_ctx, offset_size);
if (id == cie_id) if (id == cie_id)
{ {
last_cie_ptr = fde_ctx->data - 8; last_cie_ptr = st;
/* we need some bits out of the CIE in order to parse all contents */ /* we need some bits out of the CIE in order to parse all contents */
if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE;
cie_ctx->data = fde_ctx->data; cie_ctx->data = fde_ctx->data;
@ -2764,9 +2793,10 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt
{ {
last_cie_ptr = cie_ptr; last_cie_ptr = cie_ptr;
cie_ctx->data = cie_ptr; cie_ctx->data = cie_ptr;
cie_ctx->end_data = cie_ptr + 4; cie_ctx->end_data = cie_ptr + (offset_size == 4 ? 4 : 4 + 8);
cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); cie_ctx->end_data += dwarf2_parse_3264(cie_ctx, &offset_size);
if (dwarf2_parse_u4(cie_ctx) != cie_id)
if (dwarf2_parse_offset(cie_ctx, in_eh_frame ? word_size : offset_size) != cie_id)
{ {
FIXME("wrong CIE pointer at %x from FDE %x\n", FIXME("wrong CIE pointer at %x from FDE %x\n",
(unsigned)(cie_ptr - start_data), (unsigned)(cie_ptr - start_data),

1
dlls/dbghelp/dwarf.h
View File

@ -504,6 +504,7 @@ enum dwarf_calling_convention
#define DW_LNE_hi_user 0xff #define DW_LNE_hi_user 0xff
#define DW_CIE_ID ~(0x0U) #define DW_CIE_ID ~(0x0U)
#define DW64_CIE_ID ~((ULONG64)0x0)
enum dwarf_call_frame_info enum dwarf_call_frame_info
{ {