Merge pull request #2182 from dscho/untracked-cache-off-by-one

Backport "untracked cache: fix off-by-one"
This commit is contained in:
Johannes Schindelin
2019-05-07 15:16:58 +02:00
committed by Johannes Schindelin

2
dir.c
View File

@@ -2760,7 +2760,7 @@ static int read_one_dir(struct untracked_cache_dir **untracked_,
next = data + len + 1;
if (next > rd->end)
return -1;
*untracked_ = untracked = xmalloc(st_add(sizeof(*untracked), len));
*untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), len, 1));
memcpy(untracked, &ud, sizeof(ud));
memcpy(untracked->name, data, len + 1);
data = next;