svn commit: r281935 - stable/9/contrib/binutils/bfd

[Ed Maste]

Author: emaste
Date: Fri Apr 24 15:36:58 2015
New Revision: 281935
URL: https://svnweb.freebsd.org/changeset/base/281935

Log:
  MFC r279301: GNU nm: Avoid NULL dereference
  
    bfd_dwarf2_find_line() calls find_line() with NULL functionname_ptr,
    which resulted in a crash on certain ELF objects.
  
    This change was implemented independently from upstream binutils, but
    I have checked that the crash does not happen there.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/contrib/binutils/bfd/dwarf2.c
Directory Properties:
  stable/9/contrib/binutils/   (props changed)

Modified: stable/9/contrib/binutils/bfd/dwarf2.c
==============================================================================
--- stable/9/contrib/binutils/bfd/dwarf2.c	Fri Apr 24 15:34:20 2015	(r281934)
+++ stable/9/contrib/binutils/bfd/dwarf2.c	Fri Apr 24 15:36:58 2015	(r281935)
@@ -2382,7 +2382,8 @@ find_line (bfd *abfd,
   else
     addr += section->vma;
   *filename_ptr = NULL;
-  *functionname_ptr = NULL;
+  if (!do_line)
+    *functionname_ptr = NULL;
   *linenumber_ptr = 0;
 
   if (! *pinfo)