2009-06-10 Philip Blundell <philb@gnu.org>

* elf32-arm.c (elf32_arm_fix_exidx_coverage): Avoid crash if
	elf_sec->this_hdr == NULL.
This commit is contained in:
Phil Blundell 2009-06-12 14:26:08 +00:00
parent f64fddf13a
commit dec9d5dfd7
2 changed files with 12 additions and 6 deletions

View File

@ -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.

View File

@ -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)