CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-17 09:06:50 +02:00
Code Issues Projects Releases Wiki Activity

Plug another unusual leak.

Browse Source 
(AD_mark_helper): Free malloc'd filename if hash_insert says
that string is already in the hash table.
This commit is contained in:
Jim Meyering
2006-07-03 17:38:20 +00:00
parent 1a29d221b8
commit a9cf203e2d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/remove.c
+10 -3
View File
@@ -497,7 +497,7 @@ AD_pop_and_chdir (DIR **dirp, Dirstack_state *ds, char **prev_dir)
/* Initialize *HT if it is NULL.
Insert FILENAME into HT. */
static void
AD_mark_helper (Hash_table **ht, char const *filename)
AD_mark_helper (Hash_table **ht, char *filename)
{
if (*ht == NULL)
{
@@ -506,8 +506,15 @@ AD_mark_helper (Hash_table **ht, char const *filename)
if (*ht == NULL)
xalloc_die ();
}
if (! hash_insert (*ht, filename))
void *ent = hash_insert (*ht, filename);
if (ent == NULL)
xalloc_die ();
else
{
if (ent != filename)
free (filename);
}
}
/* Mark FILENAME (in current directory) as unremovable. */
@@ -525,7 +532,7 @@ static void
AD_mark_current_as_unremovable (Dirstack_state *ds)
{
struct AD_ent *top = AD_stack_top (ds);
char const *curr = top_dir (ds);
char *curr = top_dir (ds);
assert (1 < AD_stack_height (ds));