[binutils-gdb] Add a check for a NULL table pointer before attempting to compute a DWARF filename.

Nick Clifton nickc@sourceware.org
Tue Apr 17 13:30:00 GMT 2018


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

commit 6327533b1fd29fa86f6bf34e61c332c010e3c689
Author: Nick Clifton <nickc@redhat.com>
Date:   Tue Apr 17 14:30:07 2018 +0100

    Add a check for a NULL table pointer before attempting to compute a DWARF filename.
    
    	PR 23065
    	* dwarf2.c (concat_filename): Check for a NULL table pointer.

Diff:
---
 bfd/ChangeLog | 5 +++++
 bfd/dwarf2.c  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ea3933..eb283d6 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-17  Nick Clifton  <nickc@redhat.com>
+
+	PR 23065
+	* dwarf2.c (concat_filename): Check for a NULL table pointer.
+
 2018-04-16  Nick Clifton  <nickc@redhat.com>
 
 	PR 23061
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index ca22db7..0f8257f 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -1566,7 +1566,7 @@ concat_filename (struct line_info_table *table, unsigned int file)
 {
   char *filename;
 
-  if (file - 1 >= table->num_files)
+  if (table == NULL || file - 1 >= table->num_files)
     {
       /* FILE == 0 means unknown.  */
       if (file)



More information about the Binutils-cvs mailing list