svn commit: r360318 - in stable: 11/contrib/binutils/bfd 11/contrib/binutils/binutils 12/contrib/binutils/bfd 12/contrib/binutils/binutils

[Dimitry Andric]

Author: dim
Date: Sat Apr 25 15:51:30 2020
New Revision: 360318
URL: https://svnweb.freebsd.org/changeset/base/360318

Log:
  MFC r354057 (by brooks):
  
  binutils: Fix bugs found by -Wpointer-compare
  
  The MIPS bug was introduced by upstream commit 7403cb630, which failed
  to account for the additional indirection introduced and also dropped
  one of the checks; change it to the standard "NULL-or-empty" check as
  used elsewhere in BFD, which is also what upstream now has.
  
  Submitted by:	James Clarke <jrtc27 at jrtc27.com>
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D21911

Modified:
  stable/12/contrib/binutils/bfd/elfxx-mips.c
  stable/12/contrib/binutils/binutils/stabs.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/contrib/binutils/bfd/elfxx-mips.c
  stable/11/contrib/binutils/binutils/stabs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/contrib/binutils/bfd/elfxx-mips.c
==============================================================================
--- stable/12/contrib/binutils/bfd/elfxx-mips.c	Sat Apr 25 15:45:43 2020	(r360317)
+++ stable/12/contrib/binutils/bfd/elfxx-mips.c	Sat Apr 25 15:51:30 2020	(r360318)
@@ -3966,7 +3966,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_b
       *namep = bfd_elf_string_from_elf_section (input_bfd,
 						symtab_hdr->sh_link,
 						sym->st_name);
-      if (*namep == '\0')
+      if (*namep == NULL || **namep == '\0')
 	*namep = bfd_section_name (input_bfd, sec);
 
       target_is_16_bit_code_p = (sym->st_other == STO_MIPS16);

Modified: stable/12/contrib/binutils/binutils/stabs.c
==============================================================================
--- stable/12/contrib/binutils/binutils/stabs.c	Sat Apr 25 15:45:43 2020	(r360317)
+++ stable/12/contrib/binutils/binutils/stabs.c	Sat Apr 25 15:51:30 2020	(r360318)
@@ -2668,7 +2668,7 @@ parse_stab_members (void *dhandle, struct stab_handle 
 	      ++*pp;
 	      voffset &= 0x7fffffff;
 
-	      if (**pp == ';' || *pp == '\0')
+	      if (**pp == ';' || **pp == '\0')
 		{
 		  /* Must be g++ version 1.  */
 		  context = DEBUG_TYPE_NULL;