PR 5646

	* elf64-ppc.c (ppc64_elf_tls_optimize): Ensure htab->tls_get_addr
	non-NULL before dereferencing.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5877459..4a67372 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-19  Alan Modra  <amodra@bigpond.net.au>
+
+       PR 5646
+       * elf64-ppc.c (ppc64_elf_tls_optimize): Ensure htab->tls_get_addr
+       non-NULL before dereferencing.
+
 2008-01-15  Alan Modra  <amodra@bigpond.net.au>
 
        PR 5604

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index a41269c..026c52e 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -7074,7 +7074,7 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info)
                      break;
                    }
 
-                 if (expecting_tls_get_addr)
+                 if (expecting_tls_get_addr && htab->tls_get_addr != NULL)
                    {
                      struct plt_entry *ent;
                      for (ent = htab->tls_get_addr->elf.plt.plist;
@@ -7091,7 +7091,7 @@ ppc64_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, struct bfd_link_info *info)
                          }
                    }
 
-                 if (expecting_tls_get_addr)
+                 if (expecting_tls_get_addr && htab->tls_get_addr_fd != NULL)
                    {
                      struct plt_entry *ent;
                      for (ent = htab->tls_get_addr_fd->elf.plt.plist;