2007-07-24 Michael Snyder <msnyder@access-company.com>

	* elflink.c (bfd_elf_final_link): Avoid redundant frees -- return
	on bfd_malloc error rather than goto error_return.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 22f8641e2f9701e4f89a6f1254e5b15d7d6d6008..1b377b4af87cebf0d881fe90e81eb3ab7d7f13cb 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Michael Snyder  <msnyder@access-company.com>
+
+       * elflink.c (bfd_elf_final_link): Avoid redundant frees -- return
+       on bfd_malloc error rather than goto error_return.
+
 2007-07-24  Alan Modra  <amodra@bigpond.net.au>
 
        * elflink.c (_bfd_elf_link_just_syms, merge_sections_remove_hook,

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 2fd8f053ef92ea8a77f373adc14eff5463c8becf..07a6aec0ab917e44adcd8be5c649a7f396178b64 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -11043,7 +11043,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
     {
       bfd_byte *contents = bfd_malloc (attr_size);
       if (contents == NULL)
-       goto error_return;
+       return FALSE;   /* Bail out and fail.  */
       bfd_elf_set_obj_attr_contents (abfd, contents, attr_size);
       bfd_set_section_contents (abfd, attr_section, contents, 0, attr_size);
       free (contents);