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

dbghelp: Always return a type in lookup_type, even in case of errors. 

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-02 11:22:25 +02:00 committed by Alexandre Julliard
parent 50144e2732
commit c9b0483689
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/dbghelp/dwarf.c
View File

@ -949,18 +949,21 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx,
dwarf2_debug_info_t* type; dwarf2_debug_info_t* type;
if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr))
return NULL; return ctx->symt_cache[sc_void];
if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue)))
{ {
FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue);
return NULL; return ctx->symt_cache[sc_void];
} }
if (!type->symt) if (!type->symt)
{ {
/* load the debug info entity */ /* load the debug info entity */
dwarf2_load_one_entry(ctx, type); dwarf2_load_one_entry(ctx, type);
if (!type->symt) if (!type->symt)
{
FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag);
return ctx->symt_cache[sc_void];
}
} }
return type->symt; return type->symt;
} }
@ -1240,11 +1243,7 @@ static struct symt* dwarf2_parse_pointer_type(dwarf2_parse_context_t* ctx,
TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di));
if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = sizeof(void *); if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = sizeof(void *);
if (!(ref_type = dwarf2_lookup_type(ctx, di))) ref_type = dwarf2_lookup_type(ctx, di);
{
ref_type = ctx->symt_cache[sc_void];
assert(ref_type);
}
di->symt = &symt_new_pointer(ctx->module, ref_type, size.u.uvalue)->symt; di->symt = &symt_new_pointer(ctx->module, ref_type, size.u.uvalue)->symt;
if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n");
return di->symt; return di->symt;
@ -1307,11 +1306,7 @@ static struct symt* dwarf2_parse_const_type(dwarf2_parse_context_t* ctx,
TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di));
if (!(ref_type = dwarf2_lookup_type(ctx, di))) ref_type = dwarf2_lookup_type(ctx, di);
{
ref_type = ctx->symt_cache[sc_void];
assert(ref_type);
}
if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n");
di->symt = ref_type; di->symt = ref_type;
@ -1327,11 +1322,7 @@ static struct symt* dwarf2_parse_volatile_type(dwarf2_parse_context_t* ctx,
TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di));
if (!(ref_type = dwarf2_lookup_type(ctx, di))) ref_type = dwarf2_lookup_type(ctx, di);
{
ref_type = ctx->symt_cache[sc_void];
assert(ref_type);
}
if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n");
di->symt = ref_type; di->symt = ref_type;
@ -1936,11 +1927,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx,
*/ */
if (elf_is_in_thunk_area(ctx->load_offset + low_pc, ctx->thunks) >= 0) if (elf_is_in_thunk_area(ctx->load_offset + low_pc, ctx->thunks) >= 0)
return NULL; return NULL;
if (!(ret_type = dwarf2_lookup_type(ctx, di))) ret_type = dwarf2_lookup_type(ctx, di);
{
ret_type = ctx->symt_cache[sc_void];
assert(ret_type);
}
/* FIXME: assuming C source code */ /* FIXME: assuming C source code */
sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C);
subpgm.func = symt_new_function(ctx->module, ctx->compiland, subpgm.func = symt_new_function(ctx->module, ctx->compiland,
@ -2034,11 +2022,7 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx,
TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di));
if (!(ret_type = dwarf2_lookup_type(ctx, di))) ret_type = dwarf2_lookup_type(ctx, di);
{
ret_type = ctx->symt_cache[sc_void];
assert(ret_type);
}
/* FIXME: assuming C source code */ /* FIXME: assuming C source code */
sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C);