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

urlapi: skip the extra dedotdot alloc if no dot in path

Browse source 
Saves an allocation for many/most URLs.

Updates test 1395 accordingly

Closes #10403
This commit is contained in:
Daniel Stenberg 2023-02-02 11:15:47 +01:00
parent 671158242d
commit 63c53ea627
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/urlapi.c
View file

@ -783,25 +783,28 @@ static CURLUcode decode_host(struct dynbuf *host)
*
* RETURNS
*
* an allocated dedotdotified output string
* Zero for success and 'out' set to an allocated dedotdotified string.
*/
UNITTEST char *dedotdotify(const char *input, size_t clen);
UNITTEST char *dedotdotify(const char *input, size_t clen)
UNITTEST int dedotdotify(const char *input, size_t clen, char **outp);
UNITTEST int dedotdotify(const char *input, size_t clen, char **outp)
{
char *out = malloc(clen + 1);
char *outptr;
const char *orginput = input;
char *queryp;
char *out;
*outp = NULL;
/* the path always starts with a slash, and a slash has not dot */
if((clen < 2) || !memchr(input, '.', clen))
return 0;
out = malloc(clen + 1);
if(!out)
return NULL; /* out of memory */
return 1; /* out of memory */
*out = 0; /* null-terminates, for inputs like "./" */
outptr = out;
if(!*input)
/* zero length input string, return that */
return out;
/*
* To handle query-parts properly, we must find it and remove it during the
* dotdot-operation and then append it again at the end to the output
@ -906,7 +909,8 @@ UNITTEST char *dedotdotify(const char *input, size_t clen)
memcpy(outptr, &orginput[oindex], qlen + 1); /* include zero byte */
}
return out;
*outp = out;
return 0; /* success */
}
static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags)
@ -1226,13 +1230,16 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags)
if(!(flags & CURLU_PATH_AS_IS)) {
/* remove ../ and ./ sequences according to RFC3986 */
char *newp = dedotdotify((char *)path, pathlen);
if(!newp) {
char *dedot;
int err = dedotdotify((char *)path, pathlen, &dedot);
if(err) {
result = CURLUE_OUT_OF_MEMORY;
goto fail;
}
free(u->path);
u->path = newp;
if(dedot) {
free(u->path);
u->path = dedot;
}
}
}