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

trim whitespace when parsing loose refs

Browse Source
This commit is contained in:
Russell Belfer 2012-08-09 11:36:21 -07:00
parent e4607392b5
commit 2fe293b6fb
1 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/refs.c
View File

@ -128,6 +128,7 @@ static int reference_read(
result = git_futils_readbuffer_updated(file_content, path.ptr, mtime, updated); result = git_futils_readbuffer_updated(file_content, path.ptr, mtime, updated);
git_buf_free(&path); git_buf_free(&path);
return result; return result;
} }
@ -135,12 +136,13 @@ static int loose_parse_symbolic(git_reference *ref, git_buf *file_content)
{ {
const unsigned int header_len = (unsigned int)strlen(GIT_SYMREF); const unsigned int header_len = (unsigned int)strlen(GIT_SYMREF);
const char *refname_start; const char *refname_start;
char *eol;
refname_start = (const char *)file_content->ptr; refname_start = (const char *)file_content->ptr;
if (git_buf_len(file_content) < header_len + 1) if (git_buf_len(file_content) < header_len + 1) {
goto corrupt; giterr_set(GITERR_REFERENCE, "Corrupted loose reference file");
return -1;
}
/* /*
* Assume we have already checked for the header * Assume we have already checked for the header
@ -151,45 +153,16 @@ static int loose_parse_symbolic(git_reference *ref, git_buf *file_content)
ref->target.symbolic = git__strdup(refname_start); ref->target.symbolic = git__strdup(refname_start);
GITERR_CHECK_ALLOC(ref->target.symbolic); GITERR_CHECK_ALLOC(ref->target.symbolic);
/* remove newline at the end of file */
eol = strchr(ref->target.symbolic, '\n');
if (eol == NULL)
goto corrupt;
*eol = '\0';
if (eol[-1] == '\r')
eol[-1] = '\0';
return 0; return 0;
corrupt:
giterr_set(GITERR_REFERENCE, "Corrupted loose reference file");
return -1;
} }
static int loose_parse_oid(git_oid *oid, git_buf *file_content) static int loose_parse_oid(git_oid *oid, git_buf *file_content)
{ {
char *buffer; /* File format: 40 chars (OID) */
if (git_buf_len(file_content) == GIT_OID_HEXSZ &&
buffer = (char *)file_content->ptr; git_oid_fromstr(oid, git_buf_cstr(file_content)) == 0)
/* File format: 40 chars (OID) + newline */
if (git_buf_len(file_content) < GIT_OID_HEXSZ + 1)
goto corrupt;
if (git_oid_fromstr(oid, buffer) < 0)
goto corrupt;
buffer = buffer + GIT_OID_HEXSZ;
if (*buffer == '\r')
buffer++;
if (*buffer != '\n')
goto corrupt;
return 0; return 0;
corrupt:
giterr_set(GITERR_REFERENCE, "Corrupted loose reference file"); giterr_set(GITERR_REFERENCE, "Corrupted loose reference file");
return -1; return -1;
} }
@ -226,6 +199,8 @@ static int loose_lookup(git_reference *ref)
if (!updated) if (!updated)
return 0; return 0;
git_buf_rtrim(&ref_file);
if (ref->flags & GIT_REF_SYMBOLIC) { if (ref->flags & GIT_REF_SYMBOLIC) {
git__free(ref->target.symbolic); git__free(ref->target.symbolic);
ref->target.symbolic = NULL; ref->target.symbolic = NULL;
@ -259,6 +234,8 @@ static int loose_lookup_to_packfile(
if (reference_read(&ref_file, NULL, repo->path_repository, name, NULL) < 0) if (reference_read(&ref_file, NULL, repo->path_repository, name, NULL) < 0)
return -1; return -1;
git_buf_rtrim(&ref_file);
name_len = strlen(name); name_len = strlen(name);
ref = git__malloc(sizeof(struct packref) + name_len + 1); ref = git__malloc(sizeof(struct packref) + name_len + 1);
GITERR_CHECK_ALLOC(ref); GITERR_CHECK_ALLOC(ref);