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.

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,

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);