Fix botched "leak fix"

When (new_name == old_name), the previous one prefixed old_name
alone, leaving new_name untouched, and worse yet, left it
dangling pointing at an already freed memory location.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-apply.c b/builtin-apply.c
index 2a40af3ff042c840aa7ca10a76d29a015ca6a73b..1beebe5ff1d50ffaba040801d04a9c7dcd77d1d5 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2516,9 +2516,15 @@ static void prefix_patches(struct patch *p)
        if (!prefix)
                return;
        for ( ; p; p = p->next) {
-               if (p->new_name != p->old_name)
+               if (p->new_name == p->old_name) {
+                       char *prefixed = p->new_name;
+                       prefix_one(&prefixed);
+                       p->new_name = p->old_name = prefixed;
+               }
+               else {
                        prefix_one(&p->new_name);
-               prefix_one(&p->old_name);
+                       prefix_one(&p->old_name);
+               }
        }
 }