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

Merge pull request #2527 from jacquesg/refspec-crash

Browse Source 
Check if the refspec matches before transforming
This commit is contained in:
Vicent Marti 2014-08-25 18:18:06 +02:00
commit 2c1de697e0
2 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/refspec.c
View File

@ -223,8 +223,14 @@ static int refspec_transform(
int git_refspec_transform(git_buf *out, const git_refspec *spec, const char *name) int git_refspec_transform(git_buf *out, const git_refspec *spec, const char *name)
{ {
assert(out && spec && name);
git_buf_sanitize(out); git_buf_sanitize(out);
if (!git_refspec_src_matches(spec, name)) {
giterr_set(GITERR_INVALID, "ref '%s' doesn't match the source", name);
return -1;
}
if (!spec->pattern) if (!spec->pattern)
return git_buf_puts(out, spec->dst); return git_buf_puts(out, spec->dst);
@ -233,8 +239,14 @@ int git_refspec_transform(git_buf *out, const git_refspec *spec, const char *nam
int git_refspec_rtransform(git_buf *out, const git_refspec *spec, const char *name) int git_refspec_rtransform(git_buf *out, const git_refspec *spec, const char *name)
{ {
assert(out && spec && name);
git_buf_sanitize(out); git_buf_sanitize(out);
if (!git_refspec_dst_matches(spec, name)) {
giterr_set(GITERR_INVALID, "ref '%s' doesn't match the destination", name);
return -1;
}
if (!spec->pattern) if (!spec->pattern)
return git_buf_puts(out, spec->src); return git_buf_puts(out, spec->src);

48
tests/network/refspecs.c
View File

@ -88,7 +88,7 @@ void test_network_refspecs__parsing(void)
assert_refspec(GIT_DIRECTION_FETCH, "refs/pull/*/head:refs/remotes/origin/pr/*", true); assert_refspec(GIT_DIRECTION_FETCH, "refs/pull/*/head:refs/remotes/origin/pr/*", true);
} }
void assert_transform(const char *refspec, const char *name, const char *result) static void assert_valid_transform(const char *refspec, const char *name, const char *result)
{ {
git_refspec spec; git_refspec spec;
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
@ -103,8 +103,46 @@ void assert_transform(const char *refspec, const char *name, const char *result)
void test_network_refspecs__transform_mid_star(void) void test_network_refspecs__transform_mid_star(void)
{ {
assert_transform("refs/pull/*/head:refs/remotes/origin/pr/*", "refs/pull/23/head", "refs/remotes/origin/pr/23"); assert_valid_transform("refs/pull/*/head:refs/remotes/origin/pr/*", "refs/pull/23/head", "refs/remotes/origin/pr/23");
assert_transform("refs/heads/*:refs/remotes/origin/*", "refs/heads/master", "refs/remotes/origin/master"); assert_valid_transform("refs/heads/*:refs/remotes/origin/*", "refs/heads/master", "refs/remotes/origin/master");
assert_transform("refs/heads/*:refs/heads/*", "refs/heads/master", "refs/heads/master"); assert_valid_transform("refs/heads/*:refs/remotes/origin/*", "refs/heads/user/feature", "refs/remotes/origin/user/feature");
assert_transform("refs/*:refs/*", "refs/heads/master", "refs/heads/master"); assert_valid_transform("refs/heads/*:refs/heads/*", "refs/heads/master", "refs/heads/master");
assert_valid_transform("refs/heads/*:refs/heads/*", "refs/heads/user/feature", "refs/heads/user/feature");
assert_valid_transform("refs/*:refs/*", "refs/heads/master", "refs/heads/master");
}
static void assert_invalid_transform(const char *refspec, const char *name)
{
git_refspec spec;
git_buf buf = GIT_BUF_INIT;
git_refspec__parse(&spec, refspec, true);
cl_git_fail(git_refspec_transform(&buf, &spec, name));
git_buf_free(&buf);
git_refspec__free(&spec);
}
void test_network_refspecs__invalid(void)
{
assert_invalid_transform("refs/heads/*:refs/remotes/origin/*", "master");
assert_invalid_transform("refs/heads/*:refs/remotes/origin/*", "refs/headz/master");
}
static void assert_invalid_rtransform(const char *refspec, const char *name)
{
git_refspec spec;
git_buf buf = GIT_BUF_INIT;
git_refspec__parse(&spec, refspec, true);
cl_git_fail(git_refspec_rtransform(&buf, &spec, name));
git_buf_free(&buf);
git_refspec__free(&spec);
}
void test_network_refspecs__invalid_reverse(void)
{
assert_invalid_rtransform("refs/heads/*:refs/remotes/origin/*", "master");
assert_invalid_rtransform("refs/heads/*:refs/remotes/origin/*", "refs/remotes/o/master");
} }