Index: head/contrib/binutils/bfd/elfxx-mips.c
===================================================================
--- head/contrib/binutils/bfd/elfxx-mips.c
+++ head/contrib/binutils/bfd/elfxx-mips.c
@@ -3966,7 +3966,7 @@
       *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);
Index: head/contrib/binutils/binutils/stabs.c
===================================================================
--- head/contrib/binutils/binutils/stabs.c
+++ head/contrib/binutils/binutils/stabs.c
@@ -2668,7 +2668,7 @@
 	      ++*pp;
 	      voffset &= 0x7fffffff;
 
-	      if (**pp == ';' || *pp == '\0')
+	      if (**pp == ';' || **pp == '\0')
 		{
 		  /* Must be g++ version 1.  */
 		  context = DEBUG_TYPE_NULL;