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

Make refspec_transform paranoid about arguments

Browse Source
This commit is contained in:
Russell Belfer 2013-07-01 10:21:14 -07:00
parent 278ce7468d
commit 55ededfd39
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clone.c
View File

@ -204,7 +204,7 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
/* Get the remote's HEAD. This is always the first ref in remote->refs. */ /* Get the remote's HEAD. This is always the first ref in remote->refs. */
remote_head = NULL; remote_head = NULL;
if (!remote->transport->ls(remote->transport, get_head_callback, &remote_head)) if (!remote->transport->ls(remote->transport, get_head_callback, &remote_head))
return -1; return -1;
@ -220,7 +220,7 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
memset(&dummy_spec, 0, sizeof(git_refspec)); memset(&dummy_spec, 0, sizeof(git_refspec));
head_info.refspec = &dummy_spec; head_info.refspec = &dummy_spec;
} }
/* Determine the remote tracking reference name from the local master */ /* Determine the remote tracking reference name from the local master */
if (git_refspec_transform_r( if (git_refspec_transform_r(
&remote_master_name, &remote_master_name,

34
src/refspec.c
View File

@ -225,25 +225,31 @@ int git_refspec_rtransform(char *out, size_t outlen, const git_refspec *spec, co
return refspec_transform_internal(out, outlen, spec->dst, spec->src, name); return refspec_transform_internal(out, outlen, spec->dst, spec->src, name);
} }
static int refspec_transform(git_buf *out, const char *from, const char *to, const char *name) static int refspec_transform(
git_buf *out, const char *from, const char *to, const char *name)
{ {
if (git_buf_sets(out, to) < 0) size_t to_len = to ? strlen(to) : 0;
size_t from_len = from ? strlen(from) : 0;
size_t name_len = name ? strlen(name) : 0;
if (git_buf_set(out, to, to_len) < 0)
return -1; return -1;
/* if (to_len > 0) {
* No '*' at the end means that it's mapped to one specific /* No '*' at the end of 'to' means that refspec is mapped to one
* branch, so no actual transformation is needed. * specific branch, so no actual transformation is needed.
*/ */
if (git_buf_len(out) > 0 && out->ptr[git_buf_len(out) - 1] != '*') if (out->ptr[to_len - 1] != '*')
return 0; return 0;
git_buf_shorten(out, 1); /* remove trailing '*' copied from 'to' */
}
git_buf_truncate(out, git_buf_len(out) - 1); /* remove trailing '*' */ if (from_len > 0) /* ignore trailing '*' from 'from' */
git_buf_puts(out, name + strlen(from) - 1); from_len--;
if (from_len > name_len)
from_len = name_len;
if (git_buf_oom(out)) return git_buf_put(out, name + from_len, name_len - from_len);
return -1;
return 0;
} }
int git_refspec_transform_r(git_buf *out, const git_refspec *spec, const char *name) int git_refspec_transform_r(git_buf *out, const git_refspec *spec, const char *name)