PR binutils/14475:

	* archive.c (bfd_ar_hdr_from_filesystem): Allocate areltdata on
	'member' BFD.  Don't try to free 'ared'.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index deac174dea3c28f2e0ee7e7da7d66f7d09381c65..2c3bacb69836584aa4892100c8ebb34a95f3c5e8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-16  Tom Tromey  <tromey@redhat.com>
+
+       PR binutils/14475:
+       * archive.c (bfd_ar_hdr_from_filesystem): Allocate areltdata on
+       'member' BFD.  Don't try to free 'ared'.
+
 2012-08-14  Nick Clifton  <nickc@redhat.com>
 
        * po/uk.po: Updated Ukranian translation.

diff --git a/bfd/archive.c b/bfd/archive.c
index dc67da79e0ca93667a09066af94dfd032346efad..e0cb37096c8b3cbb4812f27b65ed96759d1cb1a7 100644 (file)
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -1896,7 +1896,7 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, const char *filename, bfd *member)
     }
 
   amt = sizeof (struct ar_hdr) + sizeof (struct areltdata);
-  ared = (struct areltdata *) bfd_zalloc (abfd, amt);
+  ared = (struct areltdata *) bfd_zalloc (member, amt);
   if (ared == NULL)
     return NULL;
   hdr = (struct ar_hdr *) (((char *) ared) + sizeof (struct areltdata));
@@ -1927,10 +1927,7 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, const char *filename, bfd *member)
   _bfd_ar_spacepad (hdr->ar_mode, sizeof (hdr->ar_mode), "%-8lo",
                    status.st_mode);
   if (!_bfd_ar_sizepad (hdr->ar_size, sizeof (hdr->ar_size), status.st_size))
-    {
-      free (ared);
-      return NULL;
-    }
+    return NULL;
   memcpy (hdr->ar_fmag, ARFMAG, 2);
   ared->parsed_size = status.st_size;
   ared->arch_header = (char *) hdr;