svn commit: r279572 - stable/10/contrib/binutils/bfd

[Ed Maste]

Author: emaste
Date: Wed Mar  4 01:10:09 2015
New Revision: 279572
URL: https://svnweb.freebsd.org/changeset/base/279572

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/10/contrib/binutils/bfd/dwarf2.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/binutils/bfd/dwarf2.c
==============================================================================
--- stable/10/contrib/binutils/bfd/dwarf2.c	Tue Mar  3 23:20:18 2015	(r279571)
+++ stable/10/contrib/binutils/bfd/dwarf2.c	Wed Mar  4 01:10:09 2015	(r279572)
@@ -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)