зеркало из https://github.com/microsoft/git.git
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 <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:
Родитель
6667a6ac20
Коммит
a7f0a0efa5
|
@ -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) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче