undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply: fix memory leak in prefix_one()

Browse Source 
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
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin-apply.c
View File

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