From 370426d0da768345fb53683c803d6d5a20558065 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 16 Jun 2022 14:48:13 +0930 Subject: Always free matching vector from bfd_check_format_matches 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". --- binutils/addr2line.c | 5 +---- binutils/ar.c | 10 ++-------- binutils/bucomm.c | 6 ++++-- binutils/coffdump.c | 5 +---- binutils/nm.c | 10 ++-------- binutils/objcopy.c | 10 ++-------- binutils/objdump.c | 6 +----- binutils/size.c | 6 +----- binutils/srconv.c | 5 +---- ld/ldlang.c | 7 ++++++- 10 files changed, 21 insertions(+), 49 deletions(-) diff --git a/binutils/addr2line.c b/binutils/addr2line.c index fd2ac80..baf1671 100644 --- a/binutils/addr2line.c +++ b/binutils/addr2line.c @@ -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); } diff --git a/binutils/ar.c b/binutils/ar.c index 6f3f1d6..0fdf067 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -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); } diff --git a/binutils/bucomm.c b/binutils/bucomm.c index 5cf9de7..fdc2209 100644 --- a/binutils/bucomm.c +++ b/binutils/bucomm.c @@ -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); } diff --git a/binutils/coffdump.c b/binutils/coffdump.c index d760a6c..bccc395 100644 --- a/binutils/coffdump.c +++ b/binutils/coffdump.c @@ -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); } diff --git a/binutils/nm.c b/binutils/nm.c index 539c568..49726ee 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -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; } diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 7ad39e8..df87712 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -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; } diff --git a/binutils/objdump.c b/binutils/objdump.c index e8fa8ca..6782405 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -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 diff --git a/binutils/size.c b/binutils/size.c index 86dc13e..7104025 100644 --- a/binutils/size.c +++ b/binutils/size.c @@ -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; } diff --git a/binutils/srconv.c b/binutils/srconv.c index 6fc98bc..d017edf 100644 --- a/binutils/srconv.c +++ b/binutils/srconv.c @@ -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); } diff --git a/ld/ldlang.c b/ld/ldlang.c index f10557a..839535b 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -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 -- cgit v1.1