Skip to content

Commit 0830eac

Browse files
committed
Merge branch 'js/untracked-cache-allocfix'
An underallocation in the code to read the untracked cache extension has been corrected. * js/untracked-cache-allocfix: untracked cache: fix off-by-one
2 parents af152bd + 3a7b45a commit 0830eac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2756,7 +2756,7 @@ static int read_one_dir(struct untracked_cache_dir **untracked_,
27562756
next = data + len + 1;
27572757
if (next > rd->end)
27582758
return -1;
2759-
*untracked_ = untracked = xmalloc(st_add(sizeof(*untracked), len));
2759+
*untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), len, 1));
27602760
memcpy(untracked, &ud, sizeof(ud));
27612761
memcpy(untracked->name, data, len + 1);
27622762
data = next;

0 commit comments

Comments
 (0)