diff options
| author | Mark Wielaard <[email protected]> | 2013-02-06 13:15:10 +0100 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2013-02-06 23:27:03 +0100 |
| commit | 1d5037f725b691929396896fd2b6be3cae1d87ef (patch) | |
| tree | efa4f61691eb0d74b6dae5ceb4b3901282420741 /backends/ia64_retval.c | |
| parent | 6c4b2078c51c687a1a192b001f0b331a0ccac629 (diff) | |
backends: Check type DIE exists before calling dwarf_tag ().
dwarf_attr () or dwarf_form () functions leave typedie NULL when they fail
because of missing attribute or unexpected form. In such cases first check
the DIE exists and return error instead of calling dwarf_tag () and crashing.
This also happens in the testsuite with native tests when elfutils is build
without DWZ support on a distro that uses DWZ DWARF compression on system
libraries. Only the backends used dwarf_tag () directly without checking,
all other uses in elfutils already checked whether the given DIE was NULL.
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'backends/ia64_retval.c')
| -rw-r--r-- | backends/ia64_retval.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/ia64_retval.c b/backends/ia64_retval.c index 644359b4..ac0d8c3d 100644 --- a/backends/ia64_retval.c +++ b/backends/ia64_retval.c @@ -109,7 +109,7 @@ hfa_type (Dwarf_Die *typedie, Dwarf_Word size, return fpregs_used + nregs; } - int tag = dwarf_tag (typedie); + int tag = DWARF_TAG_OR_RETURN (typedie); switch (tag) { Dwarf_Attribute attr_mem; @@ -248,7 +248,7 @@ ia64_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) Dwarf_Die die_mem; Dwarf_Die *typedie = dwarf_formref_die (attr, &die_mem); - int tag = dwarf_tag (typedie); + int tag = DWARF_TAG_OR_RETURN (typedie); /* Follow typedefs and qualifiers to get to the actual type. */ while (tag == DW_TAG_typedef @@ -257,7 +257,7 @@ ia64_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) { attr = dwarf_attr (typedie, DW_AT_type, &attr_mem); typedie = dwarf_formref_die (attr, &die_mem); - tag = dwarf_tag (typedie); + tag = DWARF_TAG_OR_RETURN (typedie); } Dwarf_Word size; @@ -271,7 +271,7 @@ ia64_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) { attr = dwarf_attr_integrate (typedie, DW_AT_type, &attr_mem); typedie = dwarf_formref_die (attr, &die_mem); - tag = dwarf_tag (typedie); + tag = DWARF_TAG_OR_RETURN (typedie); } /* Fall through. */ |