[PATCH v2 06/33] refname_is_safe(): use skip_prefix()
From: Michael Haggerty <hidden>
Date: 2016-06-16 02:19:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Michael Haggerty <redacted> --- refs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/refs.c b/refs.c
index 87dc82f..5789152 100644
--- a/refs.c
+++ b/refs.c@@ -120,17 +120,19 @@ int check_refname_format(const char *refname, int flags) int refname_is_safe(const char *refname) { - if (starts_with(refname, "refs/")) { + const char *rest; + + if (skip_prefix(refname, "refs/", &rest)) { char *buf; int result; - buf = xmallocz(strlen(refname)); /* * Does the refname try to escape refs/? * For example: refs/foo/../bar is safe but refs/foo/../../bar * is not. */ - result = !normalize_path_copy(buf, refname + strlen("refs/")); + buf = xmallocz(strlen(rest)); + result = !normalize_path_copy(buf, rest); free(buf); return result; }
--
2.8.1