romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 15:57:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

parse_proxy: bail out on zero-length proxy names!

Browse source 
The proxy parser function strips off trailing slashes off the proxy name
which could lead to a mistaken zero length proxy name which would be
treated as no proxy at all by subsequent functions!

This is now detected and an error is returned. Verified by the new test
1329.

Reported by: Chandrakant Bagul
Bug: http://curl.haxx.se/mail/lib-2012-02/0000.html
This commit is contained in:
Daniel Stenberg 2012-02-10 16:26:20 +01:00
parent ebf3138992
commit ecc93caaeb
3 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/url.c
View file

@ -4271,11 +4271,20 @@ static CURLcode parse_proxy(struct SessionHandle *data,
conn->port = strtol(prox_portno, NULL, 10);
}
else {
if(proxyptr[0]=='/') {
/* If the first character in the proxy string is a slash, fail
immediately. The following code will otherwise clear the string which
will lead to code running as if no proxy was set! */
free(proxy); /* free the former proxy string */
return CURLE_COULDNT_RESOLVE_PROXY;
}
/* without a port number after the host name, some people seem to use
a slash so we strip everything from the first slash */
atsign = strchr(proxyptr, '/');
if(atsign)
if(atsign) {
*atsign = 0x0; /* cut off path part from host name */
}
if(data->set.proxyport)
/* None given in the proxy string, then get the default one if it is