@matheusbsbs / matheus-bagliano / commits / eac70c4f64
Fork 0

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>

Johannes Schindelin committed Feb 20, 2007 at 03:45 UTC eac70c4f64a618744e05d4a5be61a356c0011033
1 file changed +9 -6
builtin-apply.c
+9 -6
@@ -2502,11 +2502,13 @@ static int use_patch(struct patch *p)
2502 return 1;
2503 }
2504
2505 -static char *prefix_one(char *name)
2505 +static void prefix_one(char **name)
2506 {
2507 - if (!name)
2508 - return name;
2509 - return xstrdup(prefix_filename(prefix, prefix_length, name));
2507 + char *old_name = *name;
2508 + if (!old_name)
2509 + return;
2510 + *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
2511 + free(old_name);
2512 }
2513
2514 static void prefix_patches(struct patch *p)
@@ -2514,8 +2516,9 @@ static void prefix_patches(struct patch *p)
2516 if (!prefix)
2517 return;
2518 for ( ; p; p = p->next) {
2517 - p->new_name = prefix_one(p->new_name);
2518 - p->old_name = prefix_one(p->old_name);
2519 + if (p->new_name != p->old_name)
2520 + prefix_one(&p->new_name);
2521 + prefix_one(&p->old_name);
2522 }
2523 }
2524