mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Perform cleanup in bfd_close after errors

Browse Source 
It seems reasonable to continue after errors in bfd_close_all_done,
particularly since bfd_close_all_done is typically called on an output
file after we've hit some sort of error elsewhere.  The iovec test is
necessary if bfd_close_all_done is to work on odd bfd's opened by
bfd_create.

	* opncls.c (bfd_close): Call bfd_close_all_done after errors
	from _bfd_write_contents.
	(bfd_close_all_done): Call _bfd_delete_bfd after errors.
	Don't call iovec->bclose when iovec is NULL.
This commit is contained in:
Alan Modra 2023-01-27 15:16:03 +10:30
parent 3e7cde4dca
commit 8219cab3f8
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bfd/opncls.c
View File

@ -805,13 +805,10 @@ RETURNS
bool bool
bfd_close (bfd *abfd) bfd_close (bfd *abfd)
{ {
if (bfd_write_p (abfd)) bool ret = (!bfd_write_p (abfd)
{ || BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)));
if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
return false;
}
return bfd_close_all_done (abfd); return bfd_close_all_done (abfd) && ret;
} }
/* /*
@ -839,15 +836,15 @@ RETURNS
bool bool
bfd_close_all_done (bfd *abfd) bfd_close_all_done (bfd *abfd)
{ {
bool ret; bool ret = BFD_SEND (abfd, _close_and_cleanup, (abfd));
if (! BFD_SEND (abfd, _close_and_cleanup, (abfd))) if (ret && abfd->iovec != NULL)
return false; {
ret = abfd->iovec->bclose (abfd) == 0;
ret = abfd->iovec->bclose (abfd) == 0; if (ret)
_maybe_make_executable (abfd);
if (ret) }
_maybe_make_executable (abfd);
_bfd_delete_bfd (abfd); _bfd_delete_bfd (abfd);