[RFA] ar.c (move_members): Plug memory leak.

[RFA] ar.c (move_members): Plug memory leak.

[Michael Snyder]

[-- Attachment #1: Type: text/plain, Size: 5 bytes --]

OK?


[-- Attachment #2: ar2.txt --]
[-- Type: text/plain, Size: 1386 bytes --]

2011-03-08  Michael Snyder  <msnyder@vmware.com>

	* ar.c (move_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:18:42 -0000
@@ -1186,6 +1186,7 @@ move_members (bfd *arch, char **files_to
 {
   bfd **after_bfd;		/* New entries go after this one */
   bfd **current_ptr_ptr;	/* cdr pointer into contents */
+  char *tmp = NULL;
 
   for (; *files_to_move; ++files_to_move)
     {
@@ -1193,8 +1194,9 @@ move_members (bfd *arch, char **files_to
       while (*current_ptr_ptr)
 	{
 	  bfd *current_ptr = *current_ptr_ptr;
-	  if (FILENAME_CMP (normalize (*files_to_move, arch),
-			    current_ptr->filename) == 0)
+	  free (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.  */
@@ -1218,10 +1220,12 @@ move_members (bfd *arch, char **files_to
       /* xgettext:c-format */
       fatal (_("no entry %s in archive %s!"), *files_to_move, arch->filename);
 
-    next_file:;
+    next_file:
+      ;
     }
 
   write_archive (arch);
+  free (tmp);
 }
 
 /* Ought to default to replacing in place, but this is existing practice!  */

Re: [RFA] ar.c (move_members): Plug memory leak.

[Nick Clifton]

Hi Michael,

> 2011-03-08  Michael Snyder<msnyder@vmware.com>
>
> 	* ar.c (move_members): Plug memory leak.

Approved and applied, with a few casts and type changes to fix compile 
time warning messages.

Cheers
   Nick