moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

When setting *_URL or *_PROXY in *_setopt(), it is important that we check 

and possibly free the existing pointer first, and then clear the "allocated"
bit. We previously mistakenly could free the new pointer passed to us by
the friendly user...!
This commit is contained in:
Daniel Stenberg 2001-08-23 14:06:38 +00:00
parent c9c2115088
commit 12acab9b86
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/url.c
View File

@ -483,9 +483,8 @@ CURLcode Curl_setopt(struct UrlData *data, CURLoption option, ...)
* Set cookie file to read and parse.
*/
cookiefile = (char *)va_arg(param, void *);
if(cookiefile) {
data->cookies = Curl_cookie_init(cookiefile);
}
if(cookiefile)
data->cookies = Curl_cookie_init(cookiefile, data->cookies);
break;
case CURLOPT_WRITEHEADER:
/*
@ -582,6 +581,11 @@ CURLcode Curl_setopt(struct UrlData *data, CURLoption option, ...)
/*
* The URL to fetch.
*/
if(data->bits.urlstringalloc) {
/* the already set URL is allocated, free it first! */
free(data->url);
data->bits.urlstringalloc=FALSE;
}
data->url = va_arg(param, char *);
break;
case CURLOPT_PORT:
@ -628,6 +632,13 @@ CURLcode Curl_setopt(struct UrlData *data, CURLoption option, ...)
/*
* Set proxy server:port to use as HTTP proxy
*/
if(data->bits.proxystringalloc) {
/*
* The already set string is allocated, free that first
*/
data->bits.proxystringalloc=FALSE;;
free(data->proxy);
}
data->proxy = va_arg(param, char *);
data->bits.httpproxy = data->proxy?1:0;
break;