From a7f0a0efa5aa2459e284a2aa5a217324bf9d3875 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Thu, 12 Sep 2013 07:15:40 -0700 Subject: [PATCH] urlmatch.c: recompute pointer after append_normalized_escapes When append_normalized_escapes is called, its internal strbuf_add* calls can cause the strbuf's buf to be reallocated changing the value of the buf pointer. Do not use the strbuf buf pointer from before any append_normalized_escapes calls afterwards. Instead recompute the needed pointer. Signed-off-by: Thomas Rast Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- urlmatch.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) { -- 2.11.4.GIT