aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2019-05-22 17:52:59 +0930
committerAlan Modra <amodra@gmail.com>2019-05-22 18:33:39 +0930
commit4decd602d8570eda5d36fd6cca2e50091000fa7a (patch)
treede2bd28a6e1a0173a08914d85b7db83b9f2b019e
parent22c6ccb89e0f38a70a42fb49eb167e7857d51f5c (diff)
downloadgdb-4decd602d8570eda5d36fd6cca2e50091000fa7a.zip
gdb-4decd602d8570eda5d36fd6cca2e50091000fa7a.tar.gz
gdb-4decd602d8570eda5d36fd6cca2e50091000fa7a.tar.bz2
bfdtest1 segfaults on hppa-hp-hpux10
The archive element cache needs tidying when closing an archive element. This patch fixes these failures: -FAIL: ar long file names (bfdtest1) -FAIL: ar thin archive (bfdtest1) -FAIL: ar thin archive with nested archive (bfdtest1) * som.c (som_bfd_free_cached_info): Call _bfd_generic_close_and_cleanup.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/som.c30
2 files changed, 20 insertions, 15 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 320e06a..af7ae75 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-22 Alan Modra <amodra@gmail.com>
+
+ * som.c (som_bfd_free_cached_info): Call
+ _bfd_generic_close_and_cleanup.
+
2019-05-21 Faraz Shahbazker <fshahbazker@wavecomp.com>
* elfxx-mips.c (_bfd_mips_elf_check_relocs): Generate error
diff --git a/bfd/som.c b/bfd/som.c
index 640253e..0d17b32 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -6695,25 +6695,25 @@ som_write_armap (bfd *abfd,
static bfd_boolean
som_bfd_free_cached_info (bfd *abfd)
{
- asection *o;
-
- if (bfd_get_format (abfd) != bfd_object)
- return TRUE;
+ if (bfd_get_format (abfd) == bfd_object)
+ {
+ asection *o;
#define FREE(x) if (x != NULL) { free (x); x = NULL; }
- /* Free the native string and symbol tables. */
- FREE (obj_som_symtab (abfd));
- FREE (obj_som_stringtab (abfd));
- for (o = abfd->sections; o != NULL; o = o->next)
- {
- /* Free the native relocations. */
- o->reloc_count = (unsigned) -1;
- FREE (som_section_data (o)->reloc_stream);
- /* Do not free the generic relocations as they are objalloc'ed. */
- }
+ /* Free the native string and symbol tables. */
+ FREE (obj_som_symtab (abfd));
+ FREE (obj_som_stringtab (abfd));
+ for (o = abfd->sections; o != NULL; o = o->next)
+ {
+ /* Free the native relocations. */
+ o->reloc_count = (unsigned) -1;
+ FREE (som_section_data (o)->reloc_stream);
+ /* Do not free the generic relocations as they are objalloc'ed. */
+ }
#undef FREE
+ }
- return TRUE;
+ return _bfd_generic_close_and_cleanup (abfd);
}
/* End of miscellaneous support functions. */