X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=urlmatch.c;fp=urlmatch.c;h=ec87cba75099ebe05e936430ca3b688275e01a4a;hb=a7f0a0efa5aa2459e284a2aa5a217324bf9d3875;hp=1db76c89bc2183855da5d6e3bc54f4fdef471462;hpb=6667a6ac20747eb56eb2c03c39aceaf6aebbae3c;p=thirdparty%2Fgit.git

diff --git a/urlmatch.c b/urlmatch.c
index 1db76c89bc..ec87cba750 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -281,9 +281,11 @@ char *url_normalize(const char *url, struct url_info *out_info)
 		url_len--;
 	}
 	for (;;) {
-		const char *seg_start = norm.buf + norm.len;
+		const char *seg_start;
+		size_t seg_start_off = norm.len;
 		const char *next_slash = url + strcspn(url, "/?#");
 		int skip_add_slash = 0;
+
 		/*
 		 * RFC 3689 indicates that any . or .. segments should be
 		 * unescaped before being checked for.
@@ -297,6 +299,8 @@ char *url_normalize(const char *url, struct url_info *out_info)
 			strbuf_release(&norm);
 			return NULL;
 		}
+
+		seg_start = norm.buf + seg_start_off;
 		if (!strcmp(seg_start, ".")) {
 			/* ignore a . segment; be careful not to remove initial '/' */
 			if (seg_start == path_start + 1) {