[binutils-gdb] PR 21408, segfault in display_debug_lines_decoded

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f082820db966c79e47a143da774700055a1fad41

commit f082820db966c79e47a143da774700055a1fad41
Author: Alan Modra <amodra@gmail.com>
Date:   Sun Apr 23 13:49:50 2017 +0930

    PR 21408, segfault in display_debug_lines_decoded
    
    	PR 21408
    	* dwarf.c (display_debug_lines_decoded): Don't segfault on NULL
    	file_table.

Diff:
---
 binutils/ChangeLog |  6 ++++++
 binutils/dwarf.c   | 12 +++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e833b05..a19d488 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-23  Alan Modra  <amodra@gmail.com>
+
+	PR 21408
+	* dwarf.c (display_debug_lines_decoded): Don't segfault on NULL
+	file_table.
+
 2017-04-21  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/21378
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 559d6f8..bb141e4 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -3808,11 +3808,10 @@ display_debug_lines_decoded (struct dwarf_section *section,
 	    }
 
 	  /* Print the Compilation Unit's name and a header.  */
-	  if (directory_table == NULL)
-	    {
-	      printf (_("CU: %s:\n"), file_table[0].name);
-	      printf (_("File name                            Line number    Starting address\n"));
-	    }
+	  if (file_table == NULL)
+	    ;
+	  else if (directory_table == NULL)
+	    printf (_("CU: %s:\n"), file_table[0].name);
 	  else
 	    {
 	      unsigned int ix = file_table[0].directory_index;
@@ -3836,10 +3835,9 @@ display_debug_lines_decoded (struct dwarf_section *section,
 		printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
 	      else
 		printf ("%s:\n", file_table[0].name);
-
-	      printf (_("File name                            Line number    Starting address\n"));
 	    }
 
+	  printf (_("File name                            Line number    Starting address\n"));
 	  saved_linfo = linfo;
 	}