apply: fix memory leak in prefix_one()

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2007-02-20 03:45:49 +01:00 committed by Junio C Hamano
parent 56185f49d0
commit eac70c4f64

View file

@ -2502,11 +2502,13 @@ static int use_patch(struct patch *p)
return 1;
}
static char *prefix_one(char *name)
static void prefix_one(char **name)
{
if (!name)
return name;
return xstrdup(prefix_filename(prefix, prefix_length, name));
char *old_name = *name;
if (!old_name)
return;
*name = xstrdup(prefix_filename(prefix, prefix_length, *name));
free(old_name);
}
static void prefix_patches(struct patch *p)
@ -2514,8 +2516,9 @@ static void prefix_patches(struct patch *p)
if (!prefix)
return;
for ( ; p; p = p->next) {
p->new_name = prefix_one(p->new_name);
p->old_name = prefix_one(p->old_name);
if (p->new_name != p->old_name)
prefix_one(&p->new_name);
prefix_one(&p->old_name);
}
}