diff options
| author | Alan Modra <amodra@gmail.com> | 2012-08-17 01:06:27 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2012-08-17 01:06:27 +0000 |
| commit | ed668b34df4ca6f8e8fbd4d5503e6b8e845833c2 (patch) | |
| tree | 1a2c23ee5387469fc6ec7cdc2052e7ab583634af /bfd | |
| parent | f75182c8228ac39e66f3e84630ab3b756b135b74 (diff) | |
| download | gdb-ed668b34df4ca6f8e8fbd4d5503e6b8e845833c2.zip gdb-ed668b34df4ca6f8e8fbd4d5503e6b8e845833c2.tar.gz gdb-ed668b34df4ca6f8e8fbd4d5503e6b8e845833c2.tar.bz2 | |
PR binutils/14475:
* archive.c (bfd_ar_hdr_from_filesystem): Revert last change.
Instead malloc areltdata.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <amodra@gmail.com> + + PR binutils/14475: + * archive.c (bfd_ar_hdr_from_filesystem): Revert last change. + Instead malloc areltdata. + 2012-08-16 Tom Tromey <tromey@redhat.com> 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; |