diff mbox series

Don't access freed memory printing objcopy warning

Message ID Y5lEcMxUdytmdyC6@squeak.grove.modra.org
State Repeat Merge
Headers
Series Don't access freed memory printing objcopy warning |

Checks

Context Check Description
snail/binutils-gdb-check warning Git am fail log

Commit Message

Alan Modra Dec. 14, 2022, 3:35 a.m. UTC 
  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.
diff mbox series

Patch

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index be08f7bd0f9..289b62355af 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.  */