yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* objcopy.c (copy_main): Remove conditional control of the calls
 to free, simplifying the code and making it easier to detect
 typos.
This commit is contained in:
Nick Clifton 2021-01-27 10:39:22 +00:00
parent 2eda57ef61
commit 67965ba289
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/ChangeLog
View File

@ -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

33
binutils/objcopy.c
View File

@ -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;
}