From bd5efa59305b4f84da4d7ece171acf37ee2c99a4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 14 Dec 2022 11:42:00 +1030 Subject: Don't access freed memory printing objcopy warning abfd->filename will be freed if bfd_close gets far enough to delete the bfd. It's possible to have an error from fclose at this point. * objcopy.c (copy_archive): Dup filename before closing bfd for potential use in bfd_nonfatal_message. --- binutils/objcopy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'binutils/objcopy.c') diff --git a/binutils/objcopy.c b/binutils/objcopy.c index be08f7b..289b623 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -3543,7 +3543,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, bfd **ptr = &obfd->archive_head; bfd *this_element; char *dir; - const char *filename; + char *filename; /* PR 24281: It is not clear what should happen when copying a thin archive. One part is straight forward - if the output archive is in a different @@ -3720,19 +3720,21 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, } *ptr = NULL; - filename = bfd_get_filename (obfd); + filename = xstrdup (bfd_get_filename (obfd)); if (!(status == 0 ? bfd_close : bfd_close_all_done) (obfd)) { status = 1; bfd_nonfatal_message (filename, NULL, NULL, NULL); } + free (filename); - filename = bfd_get_filename (ibfd); + filename = xstrdup (bfd_get_filename (ibfd)); if (!bfd_close (ibfd)) { status = 1; bfd_nonfatal_message (filename, NULL, NULL, NULL); } + free (filename); cleanup_and_exit: /* Delete all the files that we opened. */ -- cgit v1.1