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

Backport "untracked cache: fix off-by-one"
git-for-windows · May 14, 2019 · df43686 · df43686
2 parents b596df2 + 484b269
commit df43686
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dir.c b/dir.c
@@ -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;