* elfcode.h (elf_slurp_reloc_table_from_section): Don't dereference

	NULL function pointers.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4b54cc23b80cd8d60d933b30fb01e42ffa90cf38..e5fe8d67e622eed3cc9bdde613cea235adb0e916 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-05  Daniel Jacobowitz  <drow@mvista.com>
+
+       * elfcode.h (elf_slurp_reloc_table_from_section): Don't dereference
+       NULL function pointers.
+
 2003-06-05  Daniel Jacobowitz  <drow@mvista.com>
 
        * simple.c (bfd_simple_get_relocated_section_contents): Call

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 55c5b4264e0638566de71ac43f9d046576f4a8bd..0263631e791341171baa3e92b57a8ee3fd55bfe9 100644 (file)
--- 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);