readelf: Print dwarf_errmsg if dwarf_onesrcline or dwarf_linesrc fails.

Don't just crash using the NULL result in print_decoded_line_section.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 576ed83f069264015bb55e5886a18965e67c0f9f..7fc39b4a20a756f2ce995a4d2b2c45e15d0d96b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-16  Mark Wielaard  <mjw@redhat.com>
+
+       * readelf.c (print_decoded_line_section): Print dwarf_errmsg if
+       dwarf_onesrcline or dwarf_linesrc fails.
+
 2014-12-16  Mark Wielaard  <mjw@redhat.com>
 
        * readelf.c (print_debug_line_section): Correct overflow check for

diff --git a/src/readelf.c b/src/readelf.c
index 9c62853e39a715b9edc9967f4178aae8cb56f456..08b3ae477424cefc70882c8dfc1fb16742269643 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -6256,9 +6256,19 @@ print_decoded_line_section (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr,
       for (size_t n = 0; n < nlines; n++)
        {
          Dwarf_Line *line = dwarf_onesrcline (lines, n);
+         if (line == NULL)
+           {
+             printf ("  dwarf_onesrcline: %s\n", dwarf_errmsg (-1));
+             continue;
+           }
          Dwarf_Word mtime, length;
          const char *file = dwarf_linesrc (line, &mtime, &length);
-         if (strcmp (last_file, file) != 0)
+         if (file == NULL)
+           {
+             printf ("  <%s> (mtime: ?, length: ?)\n", dwarf_errmsg (-1));
+             last_file = "";
+           }
+         else if (strcmp (last_file, file) != 0)
            {
              printf ("  %s (mtime: %" PRIu64 ", length: %" PRIu64 ")\n",
                      file, mtime, length);