proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-25 20:27:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow peeled references without trailing newline at end of file

Browse Source 
Also ammends one of the tag tests to make sure it's working.
This commit is contained in:
Scott J. Goldman 2013-01-22 15:49:51 -08:00
parent 2a707d0e24
commit cb35094be3
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/refs.c
View File

@ -328,7 +328,7 @@ static int packed_parse_peel(
if (git__prefixcmp(tag_ref->name, GIT_REFS_TAGS_DIR) != 0)
goto corrupt;
if (buffer + GIT_OID_HEXSZ >= buffer_end)
if (buffer + GIT_OID_HEXSZ > buffer_end)
goto corrupt;
/* Is this a valid object id? */
@ -339,10 +339,14 @@ static int packed_parse_peel(
if (*buffer == '\r')
buffer++;
if (*buffer != '\n')
goto corrupt;
if (buffer != buffer_end) {
if (*buffer == '\n')
buffer++;
else
goto corrupt;
}
*buffer_out = buffer + 1;
*buffer_out = buffer;
return 0;
corrupt:

4
tests-clar/object/tag/read.c
View File

@ -62,6 +62,7 @@ void test_object_tag_read__parse_without_tagger(void)
git_tag *bad_tag;
git_commit *commit;
git_oid id, id_commit;
git_strarray ref_list;
// TODO: This is a little messy
cl_git_pass(git_repository_open(&bad_tag_repo, cl_fixture("bad_tag.git")));
@ -81,6 +82,9 @@ void test_object_tag_read__parse_without_tagger(void)
cl_assert(git_oid_cmp(&id_commit, git_commit_id(commit)) == 0);
cl_git_pass(git_reference_list(&ref_list, bad_tag_repo, GIT_REF_LISTALL));
git_strarray_free(&ref_list);
git_tag_free(bad_tag);
git_commit_free(commit);
git_repository_free(bad_tag_repo);

2
tests-clar/resources/bad_tag.git/packed-refs
View File

@ -1,3 +1,5 @@
# pack-refs with: peeled
eda9f45a2a98d4c17a09d681d88569fa4ea91755 refs/tags/e90810b
^e90810b8df3e80c413d903f631643c716887138d
d3bacb8d3ff25876a961b1963b6515170d0151ab refs/tags/hello
^6dcf9bf7541ee10456529833502442f385010c3d