opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

untracked-cache: simplify parsing by dropping "len" 

The code which parses untracked-cache extensions from disk keeps a "len"
variable, which is the size of the string we are parsing. But since we
now have an "end of string" variable, we can just use that to get the
length when we need it. This eliminates the need to keep "len" up to
date (and removes the possibility of any errors where "len" and "eos"
get out of sync).

As a bonus, it means we are not storing a string length in an "int",
which is a potential source of overflows (though in this case it seems
fairly unlikely for that to cause any memory problems).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2019-04-18 17:18:35 -04:00 committed by Junio C Hamano
parent b511d6d569
commit 08bf354de7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dir.c
View File

@ -2735,7 +2735,7 @@ static int read_one_dir(struct untracked_cache_dir **untracked_,
const unsigned char *data = rd->data, *end = rd->end;
const unsigned char *eos;
unsigned int value;
int i, len;
int i;
memset(&ud, 0, sizeof(ud));
@ -2756,19 +2756,17 @@ static int read_one_dir(struct untracked_cache_dir **untracked_,
eos = memchr(data, '\0', end - data);
if (!eos || eos == end)
return -1;
len = eos - data;
*untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), len, 1));
*untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), eos - data, 1));
memcpy(untracked, &ud, sizeof(ud));
memcpy(untracked->name, data, len + 1);
memcpy(untracked->name, data, eos - data + 1);
data = eos + 1;
for (i = 0; i < untracked->untracked_nr; i++) {
eos = memchr(data, '\0', end - data);
if (!eos || eos == end)
return -1;
len = eos - data;
untracked->untracked[i] = xmemdupz(data, len);
untracked->untracked[i] = xmemdupz(data, eos - data);
data = eos + 1;
}
@ -2776,8 +2774,7 @@ static int read_one_dir(struct untracked_cache_dir **untracked_,
rd->data = data;
for (i = 0; i < untracked->dirs_nr; i++) {
len = read_one_dir(untracked->dirs + i, rd);
if (len < 0)
if (read_one_dir(untracked->dirs + i, rd) < 0)
return -1;
}
return 0;