mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_packed_refs: use a strbuf for reading lines

Browse Source 
Current code uses a fixed PATH_MAX-sized buffer for reading
packed-refs lines. This is a reasonable guess, in the sense
that git generally cannot work with refs larger than
PATH_MAX.  However, there are a few cases where it is not
great:

  1. Some systems may have a low value of PATH_MAX, but can
     actually handle larger paths in practice. Fixing this
     code path probably isn't enough to make them work
     completely with long refs, but it is a step in the
     right direction.

  2. We use fgets, which will happily give us half a line on
     the first read, and then the rest of the line on the
     second. This is probably OK in practice, because our
     refline parser is careful enough to look for the
     trailing newline on the first line. The second line may
     look like a peeled line to us, but since "^" is illegal
     in refnames, it is not likely to come up.

     Still, it does not hurt to be more careful.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2014-12-10 05:40:07 -05:00
committed by Junio C Hamano
parent 7fa1365c54
commit 10c497aa0c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
refs.c
View File

@ -1031,16 +1031,16 @@ static const char *parse_ref_line(char *line, unsigned char *sha1)
static void read_packed_refs(FILE *f, struct ref_dir *dir) static void read_packed_refs(FILE *f, struct ref_dir *dir)
{ {
struct ref_entry *last = NULL; struct ref_entry *last = NULL;
char refline[PATH_MAX]; struct strbuf line = STRBUF_INIT;
enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled = PEELED_NONE; enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled = PEELED_NONE;
while (fgets(refline, sizeof(refline), f)) { while (strbuf_getwholeline(&line, f, '\n') != EOF) {
unsigned char sha1[20]; unsigned char sha1[20];
const char *refname; const char *refname;
static const char header[] = "# pack-refs with:"; static const char header[] = "# pack-refs with:";
if (!strncmp(refline, header, sizeof(header)-1)) { if (!strncmp(line.buf, header, sizeof(header)-1)) {
const char *traits = refline + sizeof(header) - 1; const char *traits = line.buf + sizeof(header) - 1;
if (strstr(traits, " fully-peeled ")) if (strstr(traits, " fully-peeled "))
peeled = PEELED_FULLY; peeled = PEELED_FULLY;
else if (strstr(traits, " peeled ")) else if (strstr(traits, " peeled "))
@ -1049,7 +1049,7 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir)
continue; continue;
} }
refname = parse_ref_line(refline, sha1); refname = parse_ref_line(line.buf, sha1);
if (refname) { if (refname) {
last = create_ref_entry(refname, sha1, REF_ISPACKED, 1); last = create_ref_entry(refname, sha1, REF_ISPACKED, 1);
if (peeled == PEELED_FULLY || if (peeled == PEELED_FULLY ||
@ -1059,10 +1059,10 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir)
continue; continue;
} }
if (last && if (last &&
refline[0] == '^' && line.buf[0] == '^' &&
strlen(refline) == PEELED_LINE_LENGTH && line.len == PEELED_LINE_LENGTH &&
refline[PEELED_LINE_LENGTH - 1] == '\n' && line.buf[PEELED_LINE_LENGTH - 1] == '\n' &&
!get_sha1_hex(refline + 1, sha1)) { !get_sha1_hex(line.buf + 1, sha1)) {
hashcpy(last->u.value.peeled, sha1); hashcpy(last->u.value.peeled, sha1);
/* /*
* Regardless of what the file header said, * Regardless of what the file header said,
@ -1072,6 +1072,8 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir)
last->flag |= REF_KNOWS_PEELED; last->flag |= REF_KNOWS_PEELED;
} }
} }
strbuf_release(&line);
} }
/* /*