From be38442ddacf1fd25c8868d0491ea9e98b0e9ca7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 24 May 2022 10:47:35 +0930 Subject: PR29171, invalid read causing SIGSEGV The fix here is to pass "section" down to read_and_display_attr_value. The test in read_and_display_attr_value is a little bit of hardening. PR 29171 * dwarf.c (display_debug_macro, display_debug_names): Pass section to read_and_display_attr_value2. (read_and_display_attr_value): Don't attempt to check for .dwo section name when section is NULL. --- binutils/dwarf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index d820c21..a0dfd4d 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -2717,7 +2717,7 @@ read_and_display_attr_value (unsigned long attribute, case DW_FORM_strx4: if (!do_loc) { - const char *suffix = strrchr (section->name, '.'); + const char *suffix = section ? strrchr (section->name, '.') : NULL; bool dwo = suffix && strcmp (suffix, ".dwo") == 0; if (do_wide) @@ -6273,8 +6273,9 @@ display_debug_macro (struct dwarf_section *section, SAFE_BYTE_GET_AND_INC (val, desc, 1, end); curr = read_and_display_attr_value (0, val, 0, - start, curr, end, 0, 0, offset_size, - version, NULL, 0, NULL, + start, curr, end, 0, 0, + offset_size, version, + NULL, 0, section, NULL, ' ', -1); if (n != nargs - 1) printf (","); @@ -10310,7 +10311,7 @@ display_debug_names (struct dwarf_section *section, void *file) unit_start, entryptr, unit_end, 0, 0, offset_size, dwarf_version, NULL, - (tagno < 0), NULL, + (tagno < 0), section, NULL, '=', -1); } ++tagno; -- cgit v1.1