merge-recursive: use xstrdup() instead of fixed buffer

Paths can be longer than PATH_MAX.  Avoid a buffer overrun in
check_dir_renamed() by using xstrdup() to make a private copy safely.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index 13b47629719022c0e5d1311a1c7c3cd905936700..16d2377b71bf40ae88fa5ffd5863105a40e6c96b 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2017,18 +2017,18 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
 static struct dir_rename_entry *check_dir_renamed(const char *path,
                                                  struct hashmap *dir_renames)
 {
 static struct dir_rename_entry *check_dir_renamed(const char *path,
                                                  struct hashmap *dir_renames)
 {

-       char temp[PATH_MAX];
+       char *temp = xstrdup(path);

        char *end;
        char *end;

-       struct dir_rename_entry *entry;
+       struct dir_rename_entry *entry = NULL;;

 
 

-       strcpy(temp, path);

        while ((end = strrchr(temp, '/'))) {
                *end = '\0';
                entry = dir_rename_find_entry(dir_renames, temp);
                if (entry)
        while ((end = strrchr(temp, '/'))) {
                *end = '\0';
                entry = dir_rename_find_entry(dir_renames, temp);
                if (entry)

-                       return entry;
+                       break;

        }
        }

-       return NULL;
+       free(temp);
+       return entry;

 }
 
 static void compute_collisions(struct hashmap *collisions,
 }
 
 static void compute_collisions(struct hashmap *collisions,