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

Fix parsing of commits that have no newlines in the message.

Browse Source
This commit is contained in:
Colin Timmermans 2010-11-05 18:04:46 +02:00 committed by Vicent Marti
parent 4b7483a285
commit 1081d90945
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/commit.c
View File

@ -176,14 +176,15 @@ int commit_parse_buffer(git_commit *commit, void *data, size_t len, unsigned int
char *line_end; char *line_end;
size_t message_len = buffer_end - buffer; size_t message_len = buffer_end - buffer;
/* Short message */ /* Long message */
message_len = buffer_end - buffer; message_len = buffer_end - buffer;
commit->message = git__malloc(message_len + 1); commit->message = git__malloc(message_len + 1);
memcpy(commit->message, buffer, message_len); memcpy(commit->message, buffer, message_len);
commit->message[message_len] = 0; commit->message[message_len] = 0;
/* Long message */ /* Short message */
line_end = memchr(buffer, '\n', buffer_end - buffer); if((line_end = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
line_end = buffer_end;
message_len = line_end - buffer; message_len = line_end - buffer;
commit->message_short = git__malloc(message_len + 1); commit->message_short = git__malloc(message_len + 1);

22
tests/t0401-parse.c
View File

@ -71,11 +71,19 @@ committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n\ \n\
a simple commit which works\n", a simple commit which works\n",
/* simple commit, 1 parents */ /* simple commit, no parent, no newline in message */
"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ "tree 1810dff58d8a660512d4832e740f692884338ccd\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\ author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\ committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n\ \n\
a simple commit which works",
/* simple commit, 1 parent */
"tree 1810dff58d8a660512d4832e740f692884338ccd\n\
parent e90810b8df3e80c413d903f631643c716887138d\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n\
a simple commit which works\n", a simple commit which works\n",
}; };
@ -210,7 +218,7 @@ BEGIN_TEST(parse_person_test)
"author "); "author ");
#undef TEST_PERSON_PASS #undef TEST_PERSON_PASS
#undef TESt_PERSON_FAIL #undef TEST_PERSON_FAIL
END_TEST END_TEST
@ -248,6 +256,16 @@ BEGIN_TEST(parse_buffer_test)
memset(commit, 0x0, sizeof(git_commit)); memset(commit, 0x0, sizeof(git_commit));
commit->object.repo = repo; commit->object.repo = repo;
must_pass(commit_parse_buffer(
commit,
test_commits_working[i],
strlen(test_commits_working[i]),
0x0)
);
memset(commit, 0x0, sizeof(git_commit));
commit->object.repo = repo;
must_pass(commit_parse_buffer( must_pass(commit_parse_buffer(
commit, commit,
test_commits_working[i], test_commits_working[i],