generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve: don't leak pre-populated dns entries

Browse Source 
CURLOPT_RESOLVE populates the DNS cache with entries that are marked as
eternally in use. Those entries need to be taken care of when the cache
is killed off.

Bug: http://curl.haxx.se/bug/view.cgi?id=3463121
Reported by: "tw84452852"
This commit is contained in:
Daniel Stenberg
2011-12-23 14:30:43 +01:00
parent 3e4181f88e
commit 2caa454dc1
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/hostip.c
View File

@@ -721,4 +721,25 @@ struct curl_hash *Curl_mk_dnscache(void)
return Curl_hash_alloc(7, Curl_hash_str, Curl_str_key_compare, freednsentry);
}
static int hostcache_inuse(void *data, void *hc)
{
struct Curl_dns_entry *c = (struct Curl_dns_entry *) hc;
if(c->inuse == 1)
Curl_resolv_unlock(data, c);
return 1; /* free all entries */
}
void Curl_hostcache_destroy(struct SessionHandle *data)
{
/* Entries added to the hostcache with the CURLOPT_RESOLVE function are
* still present in the cache with the inuse counter set to 1. Detect them
* and cleanup!
*/
Curl_hash_clean_with_criterium(data->dns.hostcache, data, hostcache_inuse);
Curl_hash_destroy(data->dns.hostcache);
data->dns.hostcachetype = HCACHE_NONE;
data->dns.hostcache = NULL;
}