From a86bc60bf3c7d5f4d8fd3e87e794f06806622a2f Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 27 Dec 2005 03:45:30 +0000 Subject: [PATCH] * elf.c (bfd_section_from_shdr): Treat invalid reloc sections as normal sections rather than returning false. --- bfd/ChangeLog | 5 +++++ bfd/elf.c | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 97db8cd08..fc1390125 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2005-12-27 Alan Modra + * elf.c (bfd_section_from_shdr): Treat invalid reloc sections as + normal sections rather than returning false. + +2005-12-27 Alan Modra + * coff-h8300.c (h8300_reloc16_extra_cases): Use input section "output_offset" instead of link order "offset". * coff-h8500.c (extra_case): Likewise. diff --git a/bfd/elf.c b/bfd/elf.c index 019f72a03..ff433d350 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -2045,15 +2045,16 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) represent such a section, so at least for now, we don't try. We just present it as a normal section. We also can't use it as a reloc section if it points to the null - section. */ - if (hdr->sh_link != elf_onesymtab (abfd) || hdr->sh_info == SHN_UNDEF) + section, an invalid section, or another reloc section. */ + if (hdr->sh_link != elf_onesymtab (abfd) + || hdr->sh_info == SHN_UNDEF + || (hdr->sh_info >= SHN_LORESERVE && hdr->sh_info <= SHN_HIRESERVE) + || hdr->sh_info >= num_sec + || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_REL + || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_RELA) return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); - /* Prevent endless recursion on broken objects. */ - if (elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_REL - || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_RELA) - return FALSE; if (! bfd_section_from_shdr (abfd, hdr->sh_info)) return FALSE; target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info); -- 2.11.4.GIT