romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 08:26:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixed how backslashes are treated in glob strings

Browse source
This commit is contained in:
Daniel Stenberg 2004-12-15 09:23:24 +00:00
parent f2fb9039bd
commit d88b3d3d5d
5 changed files with 76 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/urlglob.c
View file

@ -73,6 +73,8 @@ static GlobCode glob_set(URLGlob *glob, char *pattern,
++glob->size;
while (1) {
bool skip;
switch (*pattern) {
case '\0': /* URL ended while set was still open */
snprintf(glob->errormsg, sizeof(glob->errormsg),
@ -122,14 +124,28 @@ static GlobCode glob_set(URLGlob *glob, char *pattern,
return GLOB_ERROR;
case '\\': /* escaped character, skip '\' */
if (*(buf+1) == '\0') { /* but no escaping of '\0'! */
snprintf(glob->errormsg, sizeof(glob->errormsg),
"illegal pattern at pos %d\n", (int)pos);
return GLOB_ERROR;
switch(pattern[1]) {
case '[':
case ']':
case '{':
case '}':
case ',':
skip = TRUE;
break;
default:
skip = FALSE;
break;
}
++pattern;
++pos; /* intentional fallthrough */
if(skip) {
if (*(buf+1) == '\0') { /* but no escaping of '\0'! */
snprintf(glob->errormsg, sizeof(glob->errormsg),
"illegal pattern at pos %d\n", (int)pos);
return GLOB_ERROR;
}
++pattern;
++pos;
}
/* intentional fallthrough */
default:
*buf++ = *pattern++; /* copy character to set element */
++pos;