From b761a20733d1ddd57f42fefcc2e3aa272440dce7 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 30 Mar 2006 00:22:20 +0000 Subject: PR ld/2267 * elflink.c (elf_fixup_link_order): Ensure `elfsec' is not a special section number that exceeds the number of ELF sections (eg. SHN_MIPS_SCOMMON). --- bfd/ChangeLog | 7 +++++++ bfd/elflink.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 47d19f729d..51157c0da7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2006-03-30 Ben Elliston + + PR ld/2267 + * elflink.c (elf_fixup_link_order): Ensure `elfsec' is not a + special section number that exceeds the number of ELF sections + (eg. SHN_MIPS_SCOMMON). + 2006-03-27 Richard Sandiford * elfxx-mips.c (mips_got_entry): Add more commentary. diff --git a/bfd/elflink.c b/bfd/elflink.c index f0a0e83cad..88e56da54d 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -7665,7 +7665,7 @@ elf_fixup_link_order (bfd *abfd, asection *o) struct bfd_link_order *p; bfd *sub; const struct elf_backend_data *bed = get_elf_backend_data (abfd); - int elfsec; + unsigned elfsec; struct bfd_link_order **sections; asection *s, *other_sec, *linkorder_sec; bfd_vma offset; @@ -7682,7 +7682,8 @@ elf_fixup_link_order (bfd *abfd, asection *o) sub = s->owner; if (bfd_get_flavour (sub) == bfd_target_elf_flavour && elf_elfheader (sub)->e_ident[EI_CLASS] == bed->s->elfclass - && (elfsec = _bfd_elf_section_from_bfd_section (sub, s)) != -1 + && (elfsec = _bfd_elf_section_from_bfd_section (sub, s)) + && elfsec < elf_numsections (sub) && elf_elfsections (sub)[elfsec]->sh_flags & SHF_LINK_ORDER) { seen_linkorder++; -- cgit v1.2.1