[PATCH] merge-recur: fix thinko in unique_path()
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
This could result in a nasty infinite loop, or in bogus names (it used the strlen() of the newly allocated buffer instead of the original buffer). Signed-off-by: Johannes Schindelin <redacted> --- merge-recursive.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 6a796f2..5375a1b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -477,9 +477,9 @@ static char *unique_path(const char *pat char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1); int suffix = 0; struct stat st; - char *p = newpath + strlen(newpath); + char *p = newpath + strlen(path); strcpy(newpath, path); - strcat(newpath, "~"); + *(p++) = '~'; strcpy(p, branch); for (; *p; ++p) if ('/' == *p)
--
1.4.2.rc2.geb7f