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@jrtc27.com>
Obtained from:	CheriBSD
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D21911
This commit is contained in:
brooks 2019-10-24 22:34:48 +00:00
parent e7c86565cd
commit f58c2171d8
2 changed files with 2 additions and 2 deletions

View File

@ -3966,7 +3966,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
*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);

View File

@ -2668,7 +2668,7 @@ parse_stab_members (void *dhandle, struct stab_handle *info,
++*pp;
voffset &= 0x7fffffff;
if (**pp == ';' || *pp == '\0')
if (**pp == ';' || **pp == '\0')
{
/* Must be g++ version 1. */
context = DEBUG_TYPE_NULL;