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

hostip: use time_t for storing oldest DNS entry

Browse source 
Theoretically, the oldest time could overflow an int. In practice that
won't happen, but let's do this to please analyzers.

Follow-up to 9ed7d56e04

Pointed out by Coverity.
Closes #11094
This commit is contained in:
Daniel Stenberg 2023-05-09 10:01:52 +02:00
parent f7170a8f2e
commit 8e6abece40
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/hostip.c
View file

@ -199,8 +199,8 @@ create_hostcache_id(const char *name,
struct hostcache_prune_data {
time_t now;
time_t oldest; /* oldest time in cache not pruned. */
int cache_timeout;
int oldest; /* oldest time in cache not pruned */
};
/*
@ -223,7 +223,7 @@ hostcache_timestamp_remove(void *datap, void *hc)
if(age >= prune->cache_timeout)
return TRUE;
if(age > prune->oldest)
prune->oldest = (int)age;
prune->oldest = age;
}
return FALSE;
}
@ -232,8 +232,9 @@ hostcache_timestamp_remove(void *datap, void *hc)
* Prune the DNS cache. This assumes that a lock has already been taken.
* Returns the 'age' of the oldest still kept entry.
*/
static int
hostcache_prune(struct Curl_hash *hostcache, int cache_timeout, time_t now)
static time_t
hostcache_prune(struct Curl_hash *hostcache, int cache_timeout,
time_t now)
{
struct hostcache_prune_data user;
@ -269,9 +270,12 @@ void Curl_hostcache_prune(struct Curl_easy *data)
do {
/* Remove outdated and unused entries from the hostcache */
int oldest = hostcache_prune(data->dns.hostcache, timeout, now);
time_t oldest = hostcache_prune(data->dns.hostcache, timeout, now);
timeout = oldest;
if(oldest < INT_MAX)
timeout = (int)oldest; /* we know it fits */
else
timeout = INT_MAX - 1;
/* if the cache size is still too big, use the oldest age as new
prune limit */