proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-19 18:58:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fragile commit parsing in revwalk

Browse Source
This commit is contained in:
Russell Belfer 2012-06-11 15:38:33 -07:00
parent 0284a21983
commit 471fa05eb7
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/revwalk.c
View File

@ -169,14 +169,23 @@ static commit_object *commit_lookup(git_revwalk *walk, const git_oid *oid)
return commit; return commit;
} }
static int commit_error(commit_object *commit, const char *msg)
{
char commit_oid[GIT_OID_HEXSZ + 1];
git_oid_fmt(commit_oid, &commit->oid);
commit_oid[GIT_OID_HEXSZ] = '\0';
giterr_set(GITERR_ODB, "Failed to parse commit %s - %s", commit_oid, msg);
return -1;
}
static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawobj *raw) static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawobj *raw)
{ {
const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1; const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1;
unsigned char *buffer = raw->data; unsigned char *buffer = raw->data;
unsigned char *buffer_end = buffer + raw->len; unsigned char *buffer_end = buffer + raw->len;
unsigned char *parents_start; unsigned char *parents_start;
int i, parents = 0; int i, parents = 0;
int commit_time; int commit_time;
@ -207,21 +216,18 @@ static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawo
commit->out_degree = (unsigned short)parents; commit->out_degree = (unsigned short)parents;
if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) { if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
giterr_set(GITERR_ODB, "Failed to parse commit. Object is corrupted"); return commit_error(commit, "object is corrupted");
return -1;
}
buffer = memchr(buffer, '>', buffer_end - buffer); if ((buffer = memchr(buffer, '<', buffer_end - buffer)) == NULL ||
if (buffer == NULL) { (buffer = memchr(buffer, '>', buffer_end - buffer)) == NULL)
giterr_set(GITERR_ODB, "Failed to parse commit. Can't find author"); return commit_error(commit, "malformed author information");
return -1;
}
if (git__strtol32(&commit_time, (char *)buffer + 2, NULL, 10) < 0) { while (*buffer == '>' || git__isspace(*buffer))
giterr_set(GITERR_ODB, "Failed to parse commit. Can't parse commit time"); buffer++;
return -1;
} if (git__strtol32(&commit_time, (char *)buffer, NULL, 10) < 0)
return commit_error(commit, "cannot parse commit time");
commit->time = (time_t)commit_time; commit->time = (time_t)commit_time;
commit->parsed = 1; commit->parsed = 1;