add_ref(): verify that the refname is formatted correctly
In add_ref(), verify that the refname is formatted correctly before adding it to the ref_list. Here we have to allow refname components that start with ".", since (for example) the remote protocol uses synthetic reference name ".have". So add a new REFNAME_DOT_COMPONENT flag that can be passed to check_refname_format() to allow leading dots. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Sep 15, 2011 at 23:10 UTC
dce4bab6567de7c458b334e029e3dedcab5f2648
2 files changed
+19
-5
refs.c
+14
-4
@@ -56,6 +56,8 @@ static struct ref_list *add_ref(const char *name, const unsigned char *sha1,
56
entry = xmalloc(sizeof(struct ref_list) + len);
57
hashcpy(entry->sha1, sha1);
58
hashclr(entry->peeled);
59
+ if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL|REFNAME_DOT_COMPONENT))
60
+ die("Reference has invalid format: '%s'", name);
61
memcpy(entry->name, name, len);
62
entry->flag = flag;
63
entry->next = list;
@@ -900,7 +902,7 @@ static inline int bad_ref_char(int ch)
902
* the length of the component found, or -1 if the component is not
903
* legal.
904
*/
903
-static int check_refname_component(const char *ref)
905
+static int check_refname_component(const char *ref, int flags)
906
{
907
const char *cp;
908
char last = '\0';
@@ -919,8 +921,16 @@ static int check_refname_component(const char *ref)
921
}
922
if (cp == ref)
923
return -1; /* Component has zero length. */
922
- if (ref[0] == '.')
923
- return -1; /* Component starts with '.'. */
924
+ if (ref[0] == '.') {
925
+ if (!(flags & REFNAME_DOT_COMPONENT))
926
+ return -1; /* Component starts with '.'. */
927
+ /*
928
+ * Even if leading dots are allowed, don't allow "."
929
+ * as a component (".." is prevented by a rule above).
930
+ */
931
+ if (ref[1] == '\0')
932
+ return -1; /* Component equals ".". */
933
+ }
934
if (cp - ref >= 5 && !memcmp(cp - 5, ".lock", 5))
935
return -1; /* Refname ends with ".lock". */
936
return cp - ref;
@@ -932,7 +942,7 @@ int check_refname_format(const char *ref, int flags)
942
943
while (1) {
944
/* We are at the start of a path component. */
935
- component_len = check_refname_component(ref);
945
+ component_len = check_refname_component(ref, flags);
946
if (component_len < 0) {
947
if ((flags & REFNAME_REFSPEC_PATTERN) &&
948
ref[0] == '*' &&
refs.h
+5
-1
@@ -99,6 +99,7 @@ extern int for_each_reflog(each_ref_fn, void *);
99
100
#define REFNAME_ALLOW_ONELEVEL 1
101
#define REFNAME_REFSPEC_PATTERN 2
102
+#define REFNAME_DOT_COMPONENT 4
103
104
/*
105
* Return 0 iff ref has the correct format for a refname according to
@@ -106,7 +107,10 @@ extern int for_each_reflog(each_ref_fn, void *);
107
* REFNAME_ALLOW_ONELEVEL is set in flags, then accept one-level
108
* reference names. If REFNAME_REFSPEC_PATTERN is set in flags, then
109
* allow a "*" wildcard character in place of one of the name
109
- * components. No leading or repeated slashes are accepted.
110
+ * components. No leading or repeated slashes are accepted. If
111
+ * REFNAME_DOT_COMPONENT is set in flags, then allow refname
112
+ * components to start with "." (but not a whole component equal to
113
+ * "." or "..").
114
*/
115
extern int check_refname_format(const char *ref, int flags);
116