development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-04 07:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/rename-directory-detection'

Browse source 
Newly added codepath in merge-recursive had potential buffer
overrun, which has been fixed.

* en/rename-directory-detection:
  merge-recursive: use xstrdup() instead of fixed buffer
This commit is contained in:
Junio C Hamano 2018-06-18 10:18:44 -07:00
parent 929c097548 9da2d0379e
commit f72432d64e
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

@ -2211,18 +2211,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,