moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

dotdot.c: fix global declaration shadowing

Browse Source
This commit is contained in:
Yang Tse 2013-07-11 13:29:20 +02:00
parent 2022b10e50
commit 5c6f12b9f2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/dotdot.c
View File

@ -53,7 +53,7 @@ char *Curl_dedotdotify(char *input)
char *clone;
size_t clen = inlen; /* the length of the cloned input */
char *out = malloc(inlen+1);
char *outp;
char *outptr;
char *orgclone;
char *queryp;
if(!out)
@ -66,7 +66,7 @@ char *Curl_dedotdotify(char *input)
return NULL;
}
orgclone = clone;
outp = out;
outptr = out;
/*
* To handle query-parts properly, we must find it and remove it during the
@ -113,24 +113,24 @@ char *Curl_dedotdotify(char *input)
clone+=3;
clen-=3;
/* remove the last segment from the output buffer */
while(outp > out) {
outp--;
if(*outp == '/')
while(outptr > out) {
outptr--;
if(*outptr == '/')
break;
}
*outp = 0; /* zero-terminate where it stops */
*outptr = 0; /* zero-terminate where it stops */
}
else if(!strcmp("/..", clone)) {
clone[2]='/';
clone+=2;
clen-=2;
/* remove the last segment from the output buffer */
while(outp > out) {
outp--;
if(*outp == '/')
while(outptr > out) {
outptr--;
if(*outptr == '/')
break;
}
*outp = 0; /* zero-terminate where it stops */
*outptr = 0; /* zero-terminate where it stops */
}
/* D. if the input buffer consists only of "." or "..", then remove
@ -147,10 +147,10 @@ char *Curl_dedotdotify(char *input)
character or the end of the input buffer. */
do {
*outp++ = *clone++;
*outptr++ = *clone++;
clen--;
} while(*clone && (*clone != '/'));
*outp=0;
*outptr = 0;
}
} while(*clone);
@ -162,7 +162,7 @@ char *Curl_dedotdotify(char *input)
from the correct index. */
size_t oindex = queryp - orgclone;
qlen = strlen(&input[oindex]);
memcpy(outp, &input[oindex], qlen+1); /* include the ending zero byte */
memcpy(outptr, &input[oindex], qlen+1); /* include the ending zero byte */
}
free(orgclone);