diff options
| author | Sergio Durigan Junior <sergiodj@redhat.com> | 2019-05-10 16:57:26 -0400 |
|---|---|---|
| committer | Sergio Durigan Junior <sergiodj@redhat.com> | 2019-05-15 09:57:45 -0400 |
| commit | 7bede82892a06e6c26989803e70f53697392dcf9 (patch) | |
| tree | 5edec90b19a8c81d37c6903d0b563bcbe289a724 /gdb | |
| parent | 905f5b3f1d20569e2788add66687e6de11130159 (diff) | |
| download | gdb-7bede82892a06e6c26989803e70f53697392dcf9.zip gdb-7bede82892a06e6c26989803e70f53697392dcf9.tar.gz gdb-7bede82892a06e6c26989803e70f53697392dcf9.tar.bz2 | |
Don't crash if dwarf_decode_macro_bytes's 'body' is NULL
Hi,
Ref.: https://bugzilla.redhat.com/show_bug.cgi?id=1708192
https://bugzilla.redhat.com/show_bug.cgi?id=1708786
During the Fedora RPM build process, gdb-add-index is invoked to
extract the DWARF index from the binary, and GDB will segfault because
dwarf2read.c:parse_definition_macro's 'body' variable is NULL.
The underlying problem is that Fedora's rpm-build's "debugedit"
program will silently corrupt .debug_macro strings when a binary is
compiled with -g3. This is being taken care of by Mark Wielaard,
here:
https://bugzilla.redhat.com/show_bug.cgi?id=1708786
However, I still feel it's important to make GDB more resilient
against invalid DWARF input, so I'm proposing this rather simple patch
to catch the situation when "body == NULL" (i.e., it's probably been
corrupted) and issue a complaint. This is not a real fix to the
problem, of course, but at least GDB is able to finish without
segfaulting.
OK for master?
gdb/ChangeLog:
2019-05-15 Sergio Durigan Junior <sergiodj@redhat.com>
Ref.: https://bugzilla.redhat.com/show_bug.cgi?id=1708192
* dwarf2read.c (dwarf_decode_macro_bytes): Check whether 'body' is
NULL, and complain if that's the case.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 19 |
2 files changed, 24 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6c23281..3aaeb92 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-05-15 Sergio Durigan Junior <sergiodj@redhat.com> + + Ref.: https://bugzilla.redhat.com/show_bug.cgi?id=1708192 + * dwarf2read.c (parse_macro_definition): Check whether 'body' is + NULL, and complain/return if that's the case. + 2019-05-15 John Darrington <john@darrington.wattle.id.au> * s12z-tdep.c (push_pull_get_stack_adjustment): New function. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index b29c089..0e3f37f 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -24609,7 +24609,24 @@ dwarf_decode_macro_bytes (struct dwarf2_cu *cu, line == 0 ? _("zero") : _("non-zero"), line, body); if (is_define) - parse_macro_definition (current_file, line, body); + { + if (body != NULL) + parse_macro_definition (current_file, line, body); + else + { + /* Fedora's rpm-build's "debugedit" binary + corrupted .debug_macro sections. + + For more info, see + https://bugzilla.redhat.com/show_bug.cgi?id=1708786 */ + complaint (_("debug info gives %s invalid macro definition " + "without body (corrupted?) at line %d" + "on file %s"), + at_commandline ? _("command-line") + : _("in-file"), + line, current_file->filename); + } + } else { gdb_assert (macinfo_type == DW_MACRO_undef |