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

commit: properly parse empty commit messages

Browse Source 
This ensures commit->message is always non-NULL, even if the commit
message is empty or consists of only a newline.

One such commit can be found in the wild in the jQuery repository:

25b424134f
This commit is contained in:
Brodie Rao 2011-08-09 20:49:12 -07:00
parent 3eaf34f4c6
commit 04f788023f
7 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commit.c
View File

@ -221,10 +221,10 @@ int git_commit__parse_buffer(git_commit *commit, const void *data, size_t len)
} }
/* parse commit message */ /* parse commit message */
while (buffer < buffer_end && *buffer == '\n') while (buffer < buffer_end - 1 && *buffer == '\n')
buffer++; buffer++;
if (buffer < buffer_end) { if (buffer <= buffer_end) {
commit->message = git__strndup(buffer, buffer_end - buffer); commit->message = git__strndup(buffer, buffer_end - buffer);
if (!commit->message) if (!commit->message)
return GIT_ENOMEM; return GIT_ENOMEM;

BIN
tests/resources/testrepo.git/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc Normal file
View File

Binary file not shown.

BIN
tests/resources/testrepo.git/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 Normal file
View File

Binary file not shown.

BIN
tests/resources/testrepo.git/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 Normal file
View File

Binary file not shown.

BIN
tests/resources/testrepo.git/refs/heads/master
View File

Binary file not shown.

2
tests/t04-commit.c
View File

@ -560,6 +560,7 @@ static const char *commit_ids[] = {
"c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */ "c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */
"8496071c1b46c854b31185ea97743be6a8774479", /* 4 */ "8496071c1b46c854b31185ea97743be6a8774479", /* 4 */
"5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 5 */ "5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 5 */
"a65fedf39aefe402d3bb6e24df4d4f5fe4547750", /* 6 */
}; };
BEGIN_TEST(details0, "query the details on a parsed commit") BEGIN_TEST(details0, "query the details on a parsed commit")
@ -594,6 +595,7 @@ BEGIN_TEST(details0, "query the details on a parsed commit")
must_be_true(strcmp(author->email, "schacon@gmail.com") == 0); must_be_true(strcmp(author->email, "schacon@gmail.com") == 0);
must_be_true(strcmp(committer->name, "Scott Chacon") == 0); must_be_true(strcmp(committer->name, "Scott Chacon") == 0);
must_be_true(strcmp(committer->email, "schacon@gmail.com") == 0); must_be_true(strcmp(committer->email, "schacon@gmail.com") == 0);
must_be_true(message != NULL);
must_be_true(strchr(message, '\n') != NULL); must_be_true(strchr(message, '\n') != NULL);
must_be_true(commit_time > 0); must_be_true(commit_time > 0);
must_be_true(parents <= 2); must_be_true(parents <= 2);

2
tests/t10-refs.c
View File

@ -70,7 +70,7 @@ END_TEST
static const char *head_tracker_sym_ref_name = "head-tracker"; static const char *head_tracker_sym_ref_name = "head-tracker";
static const char *current_head_target = "refs/heads/master"; static const char *current_head_target = "refs/heads/master";
static const char *current_master_tip = "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"; static const char *current_master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750";
BEGIN_TEST(readsym0, "lookup a symbolic reference") BEGIN_TEST(readsym0, "lookup a symbolic reference")
git_repository *repo; git_repository *repo;