X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-ft32.c;h=78457d533033d85fb3853aec6c98caec0a428975;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=7c4e1aeb51d600d0206a8770347266528aa97b1c;hpb=5224fa039966557e869338d2591e7945cdcecb74;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/elf32-ft32.c b/bfd/elf32-ft32.c
index 7c4e1aeb51..78457d5330 100644
--- a/bfd/elf32-ft32.c
+++ b/bfd/elf32-ft32.c
@@ -1,8 +1,8 @@
 /* ft32-specific support for 32-bit ELF.
-   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+   Copyright (C) 2013-2020 Free Software Foundation, Inc.
 
    Copied from elf32-moxie.c which is..
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -389,7 +389,7 @@ ft32_elf_relocate_section (bfd *output_bfd,
 
 	  name = bfd_elf_string_from_elf_section
 	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
-	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	  name = name == NULL ? bfd_section_name (sec) : name;
 	}
       else
 	{
@@ -1230,15 +1230,13 @@ ft32_elf_relax_section
 
     }
 
-  if (internal_relocs != NULL
-      && elf_section_data (sec)->relocs != internal_relocs)
+  if (elf_section_data (sec)->relocs != internal_relocs)
     free (internal_relocs);
 
   return TRUE;
 
  error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
+  free (free_relocs);
 
   return TRUE;
 }