Re: PR31145, potential memory leak in binutils/ld
Revert most of this patch, it isn't correct to free the BFD_IN_MEMORY iostream in io_reinit. PR 31145 * format.c (io_reinit): Revert last change. Comment. * opncls.c (_bfd_delete_bfd): Likewise.
This commit is contained in:
parent
80d2ef0c44
commit
cf86e13d8b
15
bfd/format.c
15
bfd/format.c
@ -163,16 +163,15 @@ io_reinit (bfd *abfd, struct bfd_preserve *preserve)
|
||||
if (abfd->iovec != preserve->iovec)
|
||||
{
|
||||
/* Handle file backed to in-memory transition. bfd_cache_close
|
||||
won't do anything unless abfd->iovec is the cache_iovec. */
|
||||
won't do anything unless abfd->iovec is the cache_iovec.
|
||||
Don't be tempted to call iovec->bclose here. We don't want
|
||||
to call memory_bclose, which would free the bim. The bim
|
||||
must be kept if bfd_check_format_matches is going to decide
|
||||
later that the PE format needing it is in fact the correct
|
||||
target match. */
|
||||
bfd_cache_close (abfd);
|
||||
abfd->iovec = preserve->iovec;
|
||||
|
||||
if (abfd->iostream != preserve->iostream)
|
||||
{
|
||||
if ((abfd->flags & BFD_IN_MEMORY) != 0)
|
||||
free (abfd->iostream);
|
||||
abfd->iostream = preserve->iostream;
|
||||
}
|
||||
abfd->iostream = preserve->iostream;
|
||||
|
||||
/* Handle in-memory to file backed transition. */
|
||||
if ((abfd->flags & BFD_CLOSED_BY_CACHE) != 0
|
||||
|
@ -176,8 +176,6 @@ _bfd_delete_bfd (bfd *abfd)
|
||||
else
|
||||
free ((char *) bfd_get_filename (abfd));
|
||||
|
||||
if ((abfd->flags & BFD_IN_MEMORY) != 0)
|
||||
free (abfd->iostream);
|
||||
free (abfd->arelt_data);
|
||||
free (abfd);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user