undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

urlmatch.c: recompute pointer after append_normalized_escapes

Browse Source 
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 <trast@inf.ethz.ch>
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Rast 2013-09-12 07:15:40 -07:00 committed by Junio C Hamano
parent 6667a6ac20
commit a7f0a0efa5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
urlmatch.c
View File

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