diff options
author | Alan Modra <amodra@gmail.com> | 2022-08-03 13:31:57 +0100 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2022-08-03 13:31:57 +0100 |
commit | a6ad7914429a22d3d835bd998b032212b776a08a (patch) | |
tree | d81caa6275932745dedefa9f17d391454a84a19f /bfd/opncls.c | |
parent | 8b8da1a9f31941fa167c9f2bd2a80cdd1dccb452 (diff) | |
download | gdb-a6ad7914429a22d3d835bd998b032212b776a08a.zip gdb-a6ad7914429a22d3d835bd998b032212b776a08a.tar.gz gdb-a6ad7914429a22d3d835bd998b032212b776a08a.tar.bz2 |
Fix a conflict between the linker's need to rename some PE format input libraries and the BFD library's file caching mechanism.
PR 29389
bfd * bfd.c (BFD_CLOSED_BY_CACHE): New bfd flag.
* cache.c (bfd_cache_delete): Set BFD_CLOSED_BY_DELETE on the
closed bfd.
(bfd_cache_lookup_worker): Clear BFD_CLOSED_BY_DELETE on the newly
reopened bfd.
* opncls.c (bfd_set_filename): Refuse to change the name of a bfd
that has been closed by bfd_cache_delete. Mark changed bfds as
uncacheable.
* bfd-in2.h: Regenerate.
ld * ldlang.h (lang_input_statement_struct): Add sort_key field.
* emultempl/pe.em (after_open): If multiple import libraries refer
to the same bfd, store their names in the sort_key field.
* emultempl/pep.em (after_open): Likewise.
* ldlang.c (sort_filename): New function. Returns the filename to
be used when sorting input files.
(wild_sort): Use the sort_filename function.
Diffstat (limited to 'bfd/opncls.c')
-rw-r--r-- | bfd/opncls.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/bfd/opncls.c b/bfd/opncls.c index f0ca904..a5bc2de 100644 --- a/bfd/opncls.c +++ b/bfd/opncls.c @@ -2107,10 +2107,28 @@ bfd_set_filename (bfd *abfd, const char *filename) { size_t len = strlen (filename) + 1; char *n = bfd_alloc (abfd, len); - if (n) + + if (n == NULL) + return NULL; + + if (abfd->filename != NULL) { - memcpy (n, filename, len); - abfd->filename = n; + /* PR 29389. If we attempt to rename a file that has been closed due + to caching, then we will not be able to reopen it later on. */ + if (abfd->iostream == NULL && (abfd->flags & BFD_CLOSED_BY_CACHE)) + { + bfd_set_error (bfd_error_invalid_operation); + return NULL; + } + + /* Similarly if we attempt to close a renamed file because the + cache is now full, we will not be able to reopen it later on. */ + if (abfd->iostream != NULL) + abfd->cacheable = 0; } + + memcpy (n, filename, len); + abfd->filename = n; + return n; } |