diff options
| author | Alan Modra <amodra@gmail.com> | 2023-05-30 20:05:38 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-06-01 09:51:59 +0930 |
| commit | 90fd5049bde965ad217a013398ffc722f298de82 (patch) | |
| tree | 79a60f6bc8d4cc6598fda31a3f2063262aba8a54 /bfd | |
| parent | d18f60c747c220ef8ca118b61e5db5c5cdf8f28b (diff) | |
| download | fsf-binutils-gdb-90fd5049bde965ad217a013398ffc722f298de82.zip fsf-binutils-gdb-90fd5049bde965ad217a013398ffc722f298de82.tar.gz fsf-binutils-gdb-90fd5049bde965ad217a013398ffc722f298de82.tar.bz2 | |
section_by_target_index memory leak
The rs6000 backend can call coff_section_from_bfd_index from its
object_p function via coff_set_alignment_hook. If the object doesn't
match, or another target matches too, then the hash table needs to be
freed via a cleanup.
* coffgen.c (coff_object_cleanup): New function.
(coff_real_object_p): Return coff_object_cleanup, and call on
failure path. Move declaration to..
* libcoff-in.h: ..here.
(coff_object_cleanup): Declare.
* coff-stgo32.c (go32exe_cleanup): Call coff_object_cleanup.
(go32exe_check_format): Adjust assertion.
* libcoff.h: Regenerate.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/coff-stgo32.c | 3 | ||||
| -rw-r--r-- | bfd/coffgen.c | 24 | ||||
| -rw-r--r-- | bfd/libcoff-in.h | 4 | ||||
| -rw-r--r-- | bfd/libcoff.h | 4 |
4 files changed, 28 insertions, 7 deletions
diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c index f443a30..707b809 100644 --- a/bfd/coff-stgo32.c +++ b/bfd/coff-stgo32.c @@ -248,6 +248,7 @@ static void go32exe_cleanup (bfd *abfd) { abfd->origin = 0; + coff_object_cleanup (abfd); free (go32exe_temp_stub); go32exe_temp_stub = NULL; @@ -323,7 +324,7 @@ go32exe_check_format (bfd *abfd) bfd_cleanup cleanup = coff_object_p (abfd); if (cleanup == NULL) goto fail; - BFD_ASSERT (cleanup == _bfd_no_cleanup); + BFD_ASSERT (cleanup == coff_object_cleanup); return go32exe_cleanup; diff --git a/bfd/coffgen.c b/bfd/coffgen.c index c81f67c..afc663c 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -281,14 +281,25 @@ make_a_section_from_file (bfd *abfd, return result; } +void +coff_object_cleanup (bfd *abfd) +{ + if (bfd_family_coff (abfd) && bfd_get_format (abfd) == bfd_object) + { + struct coff_tdata *td = coff_data (abfd); + if (td != NULL) + { + if (td->section_by_index) + htab_delete (td->section_by_index); + if (td->section_by_target_index) + htab_delete (td->section_by_target_index); + } + } +} + /* Read in a COFF object and make it into a BFD. This is used by ECOFF as well. */ bfd_cleanup -coff_real_object_p (bfd *, - unsigned, - struct internal_filehdr *, - struct internal_aouthdr *); -bfd_cleanup coff_real_object_p (bfd *abfd, unsigned nscns, struct internal_filehdr *internal_f, @@ -358,9 +369,10 @@ coff_real_object_p (bfd *abfd, } _bfd_coff_free_symbols (abfd); - return _bfd_no_cleanup; + return coff_object_cleanup; fail: + coff_object_cleanup (abfd); _bfd_coff_free_symbols (abfd); bfd_release (abfd, tdata); fail2: diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h index 24a950d..96f4451 100644 --- a/bfd/libcoff-in.h +++ b/bfd/libcoff-in.h @@ -331,6 +331,10 @@ struct decoration_hash_entry }; /* Functions in coffgen.c. */ +extern void coff_object_cleanup + (bfd *); +extern bfd_cleanup coff_real_object_p + (bfd *, unsigned, struct internal_filehdr *, struct internal_aouthdr *); extern bfd_cleanup coff_object_p (bfd *); extern struct bfd_section *coff_section_from_bfd_index diff --git a/bfd/libcoff.h b/bfd/libcoff.h index c5d15a1..61561c5 100644 --- a/bfd/libcoff.h +++ b/bfd/libcoff.h @@ -335,6 +335,10 @@ struct decoration_hash_entry }; /* Functions in coffgen.c. */ +extern void coff_object_cleanup + (bfd *); +extern bfd_cleanup coff_real_object_p + (bfd *, unsigned, struct internal_filehdr *, struct internal_aouthdr *); extern bfd_cleanup coff_object_p (bfd *); extern struct bfd_section *coff_section_from_bfd_index |