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

Always free matching vector from bfd_check_format_matches

Browse Source 
At least one place calling list_matching_formats failed to free the
"matching" vector from bfd_check_format_matches afterwards.  Fix that
by calling free inside list_matching_formats.

binutils/
	* bucomm.c (list_matching_formats): Free arg.
	* addr2line.c (process_file): Adjust to suit.
	* ar.c (open_inarch, ranlib_touch): Likewise.
	* coffdump.c (main): Likewise.
	* nm.c (display_archive, display_file): Likewise.
	* objcopy.c (copy_file): Likewise.
	* objdump.c (display_object_bfd): Likewise.
	* size.c (display_bfd): Likewise.
	* srconv.c (main): Likewise.
ld/
	* ldlang.c (load_symbols): Free "matching".
This commit is contained in:
Alan Modra 2022-06-16 14:48:13 +09:30
parent 8ad7c8be4b
commit 370426d0da
10 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/addr2line.c
View File

@ -452,10 +452,7 @@ process_file (const char *file_name, const char *section_name,
{
bfd_nonfatal (bfd_get_filename (abfd));
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
xexit (1);
}

10
binutils/ar.c
View File

@ -1037,10 +1037,7 @@ open_inarch (const char *archive_filename, const char *file)
{
bfd_nonfatal (archive_filename);
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
xexit (1);
}
@ -1615,10 +1612,7 @@ ranlib_touch (const char *archname)
{
bfd_nonfatal (archname);
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
xexit (1);
}

6
binutils/bucomm.c
View File

@ -160,15 +160,17 @@ set_default_bfd_target (void)
/* After a FALSE return from bfd_check_format_matches with
bfd_get_error () == bfd_error_file_ambiguously_recognized, print
the possible matching targets. */
the possible matching targets and free the list of targets. */
void
list_matching_formats (char **p)
list_matching_formats (char **matching)
{
fflush (stdout);
fprintf (stderr, _("%s: Matching formats:"), program_name);
char **p = matching;
while (*p)
fprintf (stderr, " %s", *p++);
free (matching);
fputc ('\n', stderr);
}

5
binutils/coffdump.c
View File

@ -541,10 +541,7 @@ main (int ac, char **av)
bfd_nonfatal (input_file);
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
exit (1);
}

10
binutils/nm.c
View File

@ -1626,10 +1626,7 @@ display_archive (bfd *file)
{
bfd_nonfatal (bfd_get_filename (arfile));
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
}
if (last_arfile != NULL)
@ -1686,10 +1683,7 @@ display_file (char *filename)
{
bfd_nonfatal (filename);
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
retval = false;
}

10
binutils/objcopy.c
View File

@ -3925,15 +3925,9 @@ copy_file (const char *input_filename, const char *output_filename, int ofd,
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
if (obj_error == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (obj_matching);
free (obj_matching);
}
list_matching_formats (obj_matching);
if (core_error == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (core_matching);
free (core_matching);
}
list_matching_formats (core_matching);
status = 1;
}

6
binutils/objdump.c
View File

@ -5426,7 +5426,6 @@ display_object_bfd (bfd *abfd)
{
nonfatal (bfd_get_filename (abfd));
list_matching_formats (matching);
free (matching);
return;
}
@ -5445,10 +5444,7 @@ display_object_bfd (bfd *abfd)
nonfatal (bfd_get_filename (abfd));
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
}
static void

6
binutils/size.c
View File

@ -337,7 +337,6 @@ display_bfd (bfd *abfd)
{
bfd_nonfatal (bfd_get_filename (abfd));
list_matching_formats (matching);
free (matching);
return_code = 3;
return;
}
@ -360,10 +359,7 @@ display_bfd (bfd *abfd)
bfd_nonfatal (bfd_get_filename (abfd));
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
return_code = 3;
}

5
binutils/srconv.c
View File

@ -1828,10 +1828,7 @@ main (int ac, char **av)
bfd_nonfatal (input_file);
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
list_matching_formats (matching);
exit (1);
}

7
ld/ldlang.c
View File

@ -3056,7 +3056,11 @@ load_symbols (lang_input_statement_type *entry,
/* See if the emulation has some special knowledge. */
if (ldemul_unrecognized_file (entry))
return true;
{
if (err == bfd_error_file_ambiguously_recognized)
free (matching);
return true;
}
if (err == bfd_error_file_ambiguously_recognized)
{
@ -3066,6 +3070,7 @@ load_symbols (lang_input_statement_type *entry,
" matching formats:"), entry->the_bfd);
for (p = matching; *p != NULL; p++)
einfo (" %s", *p);
free (matching);
einfo ("%F\n");
}
else if (err != bfd_error_file_not_recognized