diff options
| author | Nick Clifton <nickc@redhat.com> | 2011-03-25 17:14:02 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2011-03-25 17:14:02 +0000 |
| commit | d305524692c35b2b1f3fed919058f9f1d87c42f8 (patch) | |
| tree | 8bd3e834ea694db3f8c5bb7d54a23419b2e6cd2b /binutils/ar.c | |
| parent | ccc1c7d44e1195e674f608958d21043afa17ee46 (diff) | |
| download | binutils-redhat-d305524692c35b2b1f3fed919058f9f1d87c42f8.tar.gz | |
* ar.c (move_members): Plug memory leak.
Diffstat (limited to 'binutils/ar.c')
| -rw-r--r-- | binutils/ar.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/binutils/ar.c b/binutils/ar.c index 0866a54f2a..6320a28ddc 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! */ |