From ed668b34df4ca6f8e8fbd4d5503e6b8e845833c2 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 17 Aug 2012 01:06:27 +0000 Subject: [PATCH] PR binutils/14475: * archive.c (bfd_ar_hdr_from_filesystem): Revert last change. Instead malloc areltdata. --- bfd/ChangeLog | 6 ++++++ bfd/archive.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2c3bacb..0573154 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2012-08-17 Alan Modra + + PR binutils/14475: + * archive.c (bfd_ar_hdr_from_filesystem): Revert last change. + Instead malloc areltdata. + 2012-08-16 Tom Tromey PR binutils/14475: diff --git a/bfd/archive.c b/bfd/archive.c index e0cb370..2d67e1f 100644 --- 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 (member, amt); + ared = (struct areltdata *) bfd_zmalloc (amt); if (ared == NULL) return NULL; hdr = (struct ar_hdr *) (((char *) ared) + sizeof (struct areltdata)); @@ -1927,7 +1927,10 @@ 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)) - return NULL; + { + free (ared); + return NULL; + } memcpy (hdr->ar_fmag, ARFMAG, 2); ared->parsed_size = status.st_size; ared->arch_header = (char *) hdr; -- 2.7.4