proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-03 11:01:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revwalk: relax the parsing of the commit time

Browse Source
This commit is contained in:
nulltoken 2012-07-04 16:06:07 +02:00
parent 5b07111529
commit 118cf57d42
2 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/revwalk.c
View File

@ -188,7 +188,7 @@ static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawo
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, *committer_start;
int i, parents = 0; int i, parents = 0;
int commit_time; int commit_time;
@ -219,17 +219,34 @@ 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 ((committer_start = buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
return commit_error(commit, "object is corrupted");
buffer++;
if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
return commit_error(commit, "object is corrupted"); return commit_error(commit, "object is corrupted");
if ((buffer = memchr(buffer, '<', buffer_end - buffer)) == NULL || /* Skip trailing spaces */
(buffer = memchr(buffer, '>', buffer_end - buffer)) == NULL) while (buffer > committer_start && git__isspace(*buffer))
return commit_error(commit, "malformed author information"); buffer--;
while (*buffer == '>' || git__isspace(*buffer)) /* Seek for the begining of the pack of digits */
buffer++; while (buffer > committer_start && git__isdigit(*buffer))
buffer--;
if (git__strtol32(&commit_time, (char *)buffer, NULL, 10) < 0) /* Skip potential timezone offset */
if ((buffer > committer_start) && (*buffer == '+' || *buffer == '-')) {
buffer--;
while (buffer > committer_start && git__isspace(*buffer))
buffer--;
while (buffer > committer_start && git__isdigit(*buffer))
buffer--;
}
if ((buffer == committer_start) || (git__strtol32(&commit_time, (char *)(buffer + 1), NULL, 10) < 0))
return commit_error(commit, "cannot parse commit time"); return commit_error(commit, "cannot parse commit time");
commit->time = (time_t)commit_time; commit->time = (time_t)commit_time;

44
tests-clar/revwalk/signatureparsing.c Normal file
View File

@ -0,0 +1,44 @@
#include "clar_libgit2.h"
static git_repository *_repo;
static git_revwalk *_walk;
void test_revwalk_signatureparsing__initialize(void)
{
cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git")));
cl_git_pass(git_revwalk_new(&_walk, _repo));
}
void test_revwalk_signatureparsing__cleanup(void)
{
git_revwalk_free(_walk);
git_repository_free(_repo);
}
void test_revwalk_signatureparsing__do_not_choke_when_name_contains_angle_brackets(void)
{
git_reference *ref;
git_oid commit_oid;
git_commit *commit;
const git_signature *signature;
/*
* The branch below points at a commit with angle brackets in the committer/author name
* committer <Yu V. Bin Haacked> <foo@example.com> 1323847743 +0100
*/
cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/haacked"));
git_revwalk_push(_walk, git_reference_oid(ref));
cl_git_pass(git_revwalk_next(&commit_oid, _walk));
cl_git_pass(git_commit_lookup(&commit, _repo, git_reference_oid(ref)));
signature = git_commit_committer(commit);
cl_assert_equal_s("Yu V. Bin Haacked", signature->email);
cl_assert_equal_s("", signature->name);
cl_assert_equal_i(1323847743, (int)signature->when.time);
cl_assert_equal_i(60, signature->when.offset);
git_commit_free(commit);
git_reference_free(ref);
}