Simplify the code at the end of objcopy's main() function.

 * objcopy.c (copy_main): Remove conditional control of the calls
 to free, simplifying the code and making it easier to detect
 typos.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index fd9f4bda8c28eb1dd5995016e3d1282325815a03..712a9ebc7ac93dcad5f6b7f6269b28a92e88c312 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2021-01-27  Nick Clifton  <nickc@redhat.com>
+
+       * objcopy.c (copy_main): Remove conditional control of the calls
+       to free, simplifying the code and making it easier to detect
+       typos.
+
 2021-01-26  Frederic Cambus  <fred@statdns.com>
 
        * objcopy.c (copy_main): Fix a double free happening when both

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index a5cead1cf8e602c377fac82f3020c9ba4eb88ac1..39a1ccbd7fed954741b3879e6a1df0fd7126f330 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -2793,8 +2793,7 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
        pe->timestamp = pe_data (ibfd)->coff.timestamp;
     }
 
-  if (isympp)
-    free (isympp);
+  free (isympp);
 
   if (osympp != isympp)
     free (osympp);
@@ -4612,8 +4611,7 @@ mark_symbols_used_in_relocations (bfd *ibfd, sec_ptr isection, void *symbolsarg)
        (*relpp[i]->sym_ptr_ptr)->flags |= BSF_KEEP;
     }
 
-  if (relpp != NULL)
-    free (relpp);
+  free (relpp);
 }
 
 /* Write out debugging information.  */
@@ -6008,26 +6006,13 @@ copy_main (int argc, char *argv[])
        }
     }
 
-  if (strip_specific_buffer)
-    free (strip_specific_buffer);
-
-  if (strip_unneeded_buffer)
-    free (strip_unneeded_buffer);
-
-  if (keep_specific_buffer)
-    free (keep_specific_buffer);
-
-  if (localize_specific_buffer)
-    free (localize_specific_buffer);
-
-  if (globalize_specific_buffer)
-    free (globalize_specific_buffer);
-
-  if (keepglobal_specific_buffer)
-    free (keepglobal_specific_buffer);
-
-  if (weaken_specific_buffer)
-    free (weaken_specific_buffer);
+  free (strip_specific_buffer);
+  free (strip_unneeded_buffer);
+  free (keep_specific_buffer);
+  free (localize_specific_buffer);
+  free (globalize_specific_buffer);
+  free (keepglobal_specific_buffer);
+  free (weaken_specific_buffer);
 
   return 0;
 }