From 0068d2531c2823cd2ab6deac980aa713178403f4 Mon Sep 17 00:00:00 2001 From: drow Date: Fri, 6 Jun 2003 02:12:04 +0000 Subject: [PATCH] * elfcode.h (elf_slurp_reloc_table_from_section): Don't dereference NULL function pointers. --- bfd/ChangeLog | 5 +++++ bfd/elfcode.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4b54cc23b8..e5fe8d67e6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2003-06-05 Daniel Jacobowitz + * elfcode.h (elf_slurp_reloc_table_from_section): Don't dereference + NULL function pointers. + +2003-06-05 Daniel Jacobowitz + * simple.c (bfd_simple_get_relocated_section_contents): Call _bfd_generic_link_add_symbols instead of bfd_link_add_symbols. diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 55c5b4264e..0263631e79 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -1363,7 +1363,9 @@ elf_slurp_reloc_table_from_section (abfd, asect, rel_hdr, reloc_count, relent->addend = rela.r_addend; - if (entsize == sizeof (Elf_External_Rela)) + if ((entsize == sizeof (Elf_External_Rela) + && ebd->elf_info_to_howto != NULL) + || ebd->elf_info_to_howto_rel == NULL) (*ebd->elf_info_to_howto) (abfd, relent, &rela); else (*ebd->elf_info_to_howto_rel) (abfd, relent, &rela); -- 2.11.0