romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:31:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

altsvc: cap the list at 5,000 entries

Browse source 
Avoid never-ending growth.

When adding more entries, it now deletes the first entry in the list,
which is the oldest added entry still held in memory. I decided to avoid
a Least Recently Used concept as I suspect with a list with this many
entries most entries have not been used, and we don't save the timestamp
of recent use anyway.

The net effect might (no matter what) be that the removed entry might
feel a bit "random" in the eyes of the user.

Verify with test 1669.

Reported-by: Geeknik Labs
Fixes #21183
Closes #21189
This commit is contained in:
Daniel Stenberg 2026-04-01 09:53:42 +02:00
parent c1963e2d2c
commit 0805ec043e
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 118 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/altsvc.c
View file

@ -144,6 +144,20 @@ static struct altsvc *altsvc_create(struct Curl_str *srchost,
srcport, dstport);
}
/* append the new entry to the list after possibly removing an old entry
first */
static void altsvc_append(struct altsvcinfo *asi, struct altsvc *as)
{
while(Curl_llist_count(&asi->list) >= MAX_ALTSVC_ENTRIES) {
/* It's full. Remove the first entry in the list */
struct Curl_llist_node *e = Curl_llist_head(&asi->list);
struct altsvc *oldas = Curl_node_elem(e);
Curl_node_remove(e);
altsvc_free(oldas);
}
Curl_llist_append(&asi->list, as, &as->node);
}
/* only returns SERIOUS errors */
static CURLcode altsvc_add(struct altsvcinfo *asi, const char *line)
{
@ -180,7 +194,6 @@ static CURLcode altsvc_add(struct altsvcinfo *asi, const char *line)
curlx_str_newline(&line))
;
else {
struct altsvc *as;
char dbuf[MAX_ALTSVC_DATELEN + 1];
time_t expires = 0;
time_t now = time(NULL);
@ -192,12 +205,12 @@ static CURLcode altsvc_add(struct altsvcinfo *asi, const char *line)
Curl_getdate_capped(dbuf, &expires);
if(now < expires) {
as = altsvc_create(&srchost, &dsthost, &srcalpn, &dstalpn,
(size_t)srcport, (size_t)dstport);
struct altsvc *as = altsvc_create(&srchost, &dsthost, &srcalpn, &dstalpn,
(size_t)srcport, (size_t)dstport);
if(as) {
as->expires = expires;
as->persist = persist ? 1 : 0;
Curl_llist_append(&asi->list, as, &as->node);
altsvc_append(asi, as);
}
else
return CURLE_OUT_OF_MEMORY;
@ -594,7 +607,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
else
as->expires = maxage + secs;
as->persist = persist;
Curl_llist_append(&asi->list, as, &as->node);
altsvc_append(asi, as);
infof(data, "Added alt-svc: %.*s:%d over %s",
(int)curlx_strlen(&dsthost), curlx_str(&dsthost),
dstport, Curl_alpnid2str(dstalpnid));