From: Alan Modra <amodra@sourceware.org>
To: bfd-cvs@sourceware.org
Subject: [binutils-gdb] objcopy of archives tidy
Date: Mon, 24 Apr 2023 11:33:04 +0000 (GMT) [thread overview]
Message-ID: <20230424113304.C9C3E385842D@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c1eb3cd205921fb7af668f2032ab2c7142c4f24c
commit c1eb3cd205921fb7af668f2032ab2c7142c4f24c
Author: Alan Modra <amodra@gmail.com>
Date: Sat Apr 22 16:01:02 2023 +0930
objcopy of archives tidy
This makes sure the input element bfd is closed before exiting the
loop copying elements.
* objcopy.c (copy_archive): Rename output_bfd to output_element.
Localise last_element. Close this_element in more error cases.
Diff:
---
binutils/objcopy.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index d4fc644640c..49d54bff9b2 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -3625,8 +3625,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
while (!status && this_element != NULL)
{
char *output_name;
- bfd *output_bfd;
- bfd *last_element;
+ bfd *output_element;
struct stat buf;
int stat_status = 0;
bool del = true;
@@ -3638,6 +3637,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
{
non_fatal (_("illegal pathname found in archive member: %s"),
bfd_get_filename (this_element));
+ bfd_close (this_element);
status = 1;
goto cleanup_and_exit;
}
@@ -3656,6 +3656,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
{
non_fatal (_("cannot create tempdir for archive copying (error: %s)"),
strerror (errno));
+ bfd_close (this_element);
status = 1;
goto cleanup_and_exit;
}
@@ -3693,20 +3694,21 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
/* PR binutils/3110: Cope with archives
containing multiple target types. */
if (force_output_target || !ok_object)
- output_bfd = bfd_openw (output_name, output_target);
+ output_element = bfd_openw (output_name, output_target);
else
- output_bfd = bfd_openw (output_name, bfd_get_target (this_element));
+ output_element = bfd_openw (output_name, bfd_get_target (this_element));
- if (output_bfd == NULL)
+ if (output_element == NULL)
{
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
+ bfd_close (this_element);
status = 1;
goto cleanup_and_exit;
}
if (ok_object)
{
- del = !copy_object (this_element, output_bfd, input_arch);
+ del = !copy_object (this_element, output_element, input_arch);
if (del && bfd_get_arch (this_element) == bfd_arch_unknown)
/* Try again as an unknown object file. */
@@ -3714,10 +3716,10 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
}
if (!ok_object)
- del = !copy_unknown_object (this_element, output_bfd);
+ del = !copy_unknown_object (this_element, output_element);
if (!(ok_object && !del && !status
- ? bfd_close : bfd_close_all_done) (output_bfd))
+ ? bfd_close : bfd_close_all_done) (output_element))
{
bfd_nonfatal_message (output_name, NULL, NULL, NULL);
/* Error in new object file. Don't change archive. */
@@ -3729,23 +3731,24 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
unlink (output_name);
status = 1;
}
+
+ if (status)
+ bfd_close (this_element);
else
{
if (preserve_dates && stat_status == 0)
set_times (output_name, &buf);
- /* Open the newly output file and attach to our list. */
- output_bfd = bfd_openr (output_name, output_target);
-
- l->obfd = output_bfd;
+ /* Open the newly created output file and attach to our list. */
+ output_element = bfd_openr (output_name, output_target);
- *ptr = output_bfd;
- ptr = &output_bfd->archive_next;
+ l->obfd = output_element;
- last_element = this_element;
+ *ptr = output_element;
+ ptr = &output_element->archive_next;
+ bfd *last_element = this_element;
this_element = bfd_openr_next_archived_file (ibfd, last_element);
-
bfd_close (last_element);
}
}
reply other threads:[~2023-04-24 11:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230424113304.C9C3E385842D@sourceware.org \
--to=amodra@sourceware.org \
--cc=bfd-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).