diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b6945c9..7f1ce47 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-06-10 Philip Blundell <philb@gnu.org> + + * elf32-arm.c (elf32_arm_fix_exidx_coverage): Avoid crash if + elf_sec->this_hdr == NULL. + 2009-06-12 Tristan Gingold <gingold@adacore.com> * reloc.c: Add BFD_RELOC_MACH_O_SECTDIFF and BFD_RELOC_MACH_O_PAIR. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 2a2d461..df4be8b 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -3175,11 +3175,12 @@ arm_type_of_stub (struct bfd_link_info *info, /* We have an extra 2-bytes reach because of the mode change (bit 24 (H) of BLX encoding). */ - if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2) - || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET) - || ((r_type == R_ARM_CALL) && !globals->use_blx) - || (r_type == R_ARM_JUMP24) - || (r_type == R_ARM_PLT32)) + if ((branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2) + || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET) + || ((r_type == R_ARM_CALL) && !globals->use_blx) + || (r_type == R_ARM_JUMP24) + || (r_type == R_ARM_PLT32)) + && !use_plt) { stub_type = (info->shared | globals->pic_veneer) /* PIC stubs. */ @@ -8960,7 +8961,7 @@ elf32_arm_fix_exidx_coverage (asection **text_section_order, struct bfd_elf_section_data *elf_sec = elf_section_data (sec); Elf_Internal_Shdr *hdr = &elf_sec->this_hdr; - if (hdr->sh_type != SHT_ARM_EXIDX) + if (!hdr || hdr->sh_type != SHT_ARM_EXIDX) continue; if (elf_sec->linked_to) |