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

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

Browse Source 
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>
This commit is contained in:
René Scharfe 2018-06-10 12:56:31 +02:00 committed by Junio C Hamano
parent c5b761fb27
commit 9da2d0379e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
merge-recursive.c
View File

@ -1938,18 +1938,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)
{
char temp[PATH_MAX];
char *temp = xstrdup(path);
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)
return entry;
break;
}
return NULL;
free(temp);
return entry;
}
static void compute_collisions(struct hashmap *collisions,