From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Wed, 27 Apr 2016 10:39:11 +0000 (+0200)
Subject: refname_is_safe(): use skip_prefix()
X-Git-Tag: v2.10.0-rc0~98^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39950fef8bb45e944655e48393ee04c0b33211f5;hp=728af2832c3e58222965521682414adb9a80932b;p=thirdparty%2Fgit.git

refname_is_safe(): use skip_prefix()

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---

diff --git a/refs.c b/refs.c
index 87dc82f1d8..5789152743 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;
 	}