From: Michael Snyder <msnyder@vmware.com>
To: "binutils@sourceware.org" <binutils@sourceware.org>
Subject: [RFA] (take two): ar.c (map_over_members): Plug memory leak.
Date: Tue, 08 Mar 2011 20:32:00 -0000 [thread overview]
Message-ID: <4D769256.3090103@vmware.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 89 bytes --]
Sorry for the noise. This patch replaces the previous patch for
map_over_members.
OK?
[-- Attachment #2: ar4.txt --]
[-- Type: text/plain, Size: 1419 bytes --]
2011-03-08 Michael Snyder <msnyder@vmware.com>
* ar.c (map_over_members): Plug memory leak.
Index: ar.c
===================================================================
RCS file: /cvs/src/src/binutils/ar.c,v
retrieving revision 1.72
diff -u -p -r1.72 ar.c
--- ar.c 8 Dec 2010 05:05:30 -0000 1.72
+++ ar.c 8 Mar 2011 20:30:20 -0000
@@ -199,7 +199,7 @@ map_over_members (bfd *arch, void (*func
match_count = 0;
for (head = arch->archive_next; head; head = head->archive_next)
{
- const char * filename;
+ const char * filename = NULL, * filename2 = NULL;
PROGRESS (1);
filename = head->filename;
@@ -213,11 +213,13 @@ map_over_members (bfd *arch, void (*func
else if (bfd_is_thin_archive (arch))
{
/* Thin archives store full pathnames. Need to normalize. */
+ free (filename);
filename = normalize (filename, arch);
}
- if (filename != NULL
- && !FILENAME_CMP (normalize (*files, arch), filename))
+ free (filename2);
+ filename2 = normalize (*files, arch);
+ if (filename != NULL && !FILENAME_CMP (filename2, filename))
{
++match_count;
if (counted_name_mode
@@ -237,6 +239,8 @@ map_over_members (bfd *arch, void (*func
/* xgettext:c-format */
fprintf (stderr, _("no entry %s in archive\n"), *files);
}
+ free (filename);
+ free (filename2);
}
\f
bfd_boolean operation_alters_arch = FALSE;
next reply other threads:[~2011-03-08 20:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-08 20:32 Michael Snyder [this message]
2011-03-15 11:43 ` Richard Sandiford
2011-03-15 11:52 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D769256.3090103@vmware.com \
--to=msnyder@vmware.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).