aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2011-03-25 17:14:02 +0000
committerNick Clifton <nickc@redhat.com>2011-03-25 17:14:02 +0000
commit6a6969108e510d407755889162afbe3107f2f3d8 (patch)
tree5406549d41d5fbfc3d422cbbaf4c8e553711194b /binutils
parent628534583be570e855e7bbce00b7d5e2454d3676 (diff)
downloadgdb-6a6969108e510d407755889162afbe3107f2f3d8.zip
gdb-6a6969108e510d407755889162afbe3107f2f3d8.tar.gz
gdb-6a6969108e510d407755889162afbe3107f2f3d8.tar.bz2
* ar.c (move_members): Plug memory leak.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog1
-rw-r--r--binutils/ar.c17
2 files changed, 13 insertions, 5 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 832e8ac..d369ae8 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,6 +1,7 @@
2011-03-25 Michael Snyder <msnyder@vmware.com>
* strings.c (print_strings): Plug memory leak.
+ * ar.c (move_members): Plug memory leak.
2011-03-25 Pierre Muller <muller@ics.u-strasbg.fr>
diff --git a/binutils/ar.c b/binutils/ar.c
index 0866a54..6320a28 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -1185,8 +1185,9 @@ delete_members (bfd *arch, char **files_to_delete)
static void
move_members (bfd *arch, char **files_to_move)
{
- bfd **after_bfd; /* New entries go after this one */
- bfd **current_ptr_ptr; /* cdr pointer into contents */
+ bfd **after_bfd; /* New entries go after this one. */
+ bfd **current_ptr_ptr; /* cdr pointer into contents. */
+ const char *tmp = NULL;
for (; *files_to_move; ++files_to_move)
{
@@ -1194,8 +1195,11 @@ move_members (bfd *arch, char **files_to_move)
while (*current_ptr_ptr)
{
bfd *current_ptr = *current_ptr_ptr;
- if (FILENAME_CMP (normalize (*files_to_move, arch),
- current_ptr->filename) == 0)
+
+ if (tmp != NULL)
+ free ((char *) tmp);
+ tmp = normalize (*files_to_move, arch);
+ if (FILENAME_CMP (tmp, current_ptr->filename) == 0)
{
/* Move this file to the end of the list - first cut from
where it is. */
@@ -1219,10 +1223,13 @@ move_members (bfd *arch, char **files_to_move)
/* xgettext:c-format */
fatal (_("no entry %s in archive %s!"), *files_to_move, arch->filename);
- next_file:;
+ next_file:
+ ;
}
write_archive (arch);
+ if (tmp != NULL)
+ free ((char *) tmp);
}
/* Ought to default to replacing in place, but this is existing practice! */