2011-08-03 Tristan Gingold <gingold@adacore.com>

	* mach-o.c (bfd_mach_o_canonicalize_symtab): Handle no symbols case.
	(bfd_mach_o_read_symtab_symbols): Return if no symbols.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9d2543713676d1539e1df72a87902b0cf3d6fd05..825487dbcc777a6f3323583f8147aec515750fb2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-03  Tristan Gingold  <gingold@adacore.com>
+
+       * mach-o.c (bfd_mach_o_canonicalize_symtab): Handle no symbols case.
+       (bfd_mach_o_read_symtab_symbols): Return if no symbols.
+
 2011-08-02  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * elfxx-mips.c (check_4byte_branch): Remove function.

diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index fe196c77b109a8ab8d8f1067660e069c9260b32f..069414a665fe25dc969e58a83186c053250d1cd8 100644 (file)
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -376,6 +376,13 @@ bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation)
   if (nsyms < 0)
     return nsyms;
 
+  if (nsyms == 0)
+    {
+      /* Do not try to read symbols if there are none.  */
+      alocation[0] = NULL;
+      return 0;
+    }
+
   if (bfd_mach_o_read_symtab_symbols (abfd) != 0)
     {
       (*_bfd_error_handler) (_("bfd_mach_o_canonicalize_symtab: unable to load symbols"));
@@ -1830,8 +1837,11 @@ bfd_mach_o_read_symtab_symbols (bfd *abfd)
   unsigned long i;
   int ret;
 
-  if (sym->symbols)
-    return 0;
+  if (sym == NULL || sym->symbols)
+    {
+      /* Return now if there are no symbols or if already loaded.  */
+      return 0;
+    }
 
   sym->symbols = bfd_alloc (abfd, sym->nsyms * sizeof (bfd_mach_o_asymbol));