Commit ee5da720e58f8870e5b6b272ef7514c2a717544a
2014-12-02T22:20:42
reference_create: validate loose names Validate loose reference names on Win32.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 61d1cd5..fc41a95 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -707,7 +707,7 @@ static int reference_path_available(
static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char *name)
{
- int error;
+ int error;
git_buf ref_path = GIT_BUF_INIT;
assert(file && backend && name);
diff --git a/tests/refs/create.c b/tests/refs/create.c
index 8e4d8d7..3af7c1d 100644
--- a/tests/refs/create.c
+++ b/tests/refs/create.c
@@ -151,13 +151,11 @@ void test_refs_create__propagate_eexists(void)
cl_assert(error == GIT_EEXISTS);
}
-void test_refs_create__creating_a_reference_with_an_invalid_name_returns_EINVALIDSPEC(void)
+static void test_invalid_name(const char *name)
{
git_reference *new_reference;
git_oid id;
- const char *name = "refs/heads/inv@{id";
-
git_oid_fromstr(&id, current_master_tip);
cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_create(
@@ -166,3 +164,47 @@ void test_refs_create__creating_a_reference_with_an_invalid_name_returns_EINVALI
cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_create(
&new_reference, g_repo, name, current_head_target, 0, NULL, NULL));
}
+
+void test_refs_create__creating_a_reference_with_an_invalid_name_returns_EINVALIDSPEC(void)
+{
+ test_invalid_name("refs/heads/inv@{id");
+ test_invalid_name("refs/heads/back\\slash");
+
+ test_invalid_name("refs/heads/foo ");
+ test_invalid_name("refs/heads/foo /bar");
+ test_invalid_name("refs/heads/com1:bar/foo");
+
+ test_invalid_name("refs/heads/e:");
+ test_invalid_name("refs/heads/c:/foo");
+
+ test_invalid_name("refs/heads/foo.");
+}
+
+static void test_win32_name(const char *name)
+{
+ git_reference *new_reference = NULL;
+ git_oid id;
+ int ret;
+
+ git_oid_fromstr(&id, current_master_tip);
+
+ ret = git_reference_create(&new_reference, g_repo, name, &id, 0, NULL, NULL);
+
+#ifdef GIT_WIN32
+ cl_assert_equal_i(GIT_EINVALIDSPEC, ret);
+#else
+ cl_git_pass(ret);
+#endif
+
+ git_reference_free(new_reference);
+}
+
+void test_refs_create__creating_a_loose_ref_with_invalid_windows_name(void)
+{
+ test_win32_name("refs/heads/foo./bar");
+
+ test_win32_name("refs/heads/aux");
+ test_win32_name("refs/heads/aux.foo/bar");
+
+ test_win32_name("refs/heads/com1");
+}