Projects
openEuler:22.03:LTS:LoongArch
curl
_service:tar_scm_kernel_repo:backport-CVE-2023-...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm_kernel_repo:backport-CVE-2023-38546.patch of Package curl
From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel@haxx.se> Date: Thu, 14 Sep 2023 23:28:32 +0200 Subject: [PATCH] cookie: remove unnecessary struct fields Plus: reduce the hash table size from 256 to 63. It seems unlikely to make much of a speed difference for most use cases but saves 1.5KB of data per instance. Closes #11862 Backported by: Samuel Henrique <samueloph@debian.org> --- lib/cookie.c | 13 +------------ lib/cookie.h | 13 ++++--------- lib/easy.c | 4 +--- 3 files changed, 6 insertions(+), 24 deletions(-) --- a/lib/cookie.c +++ b/lib/cookie.c @@ -115,7 +115,6 @@ free(co->name); free(co->value); free(co->maxage); - free(co->version); free(co); } @@ -666,11 +665,7 @@ } } else if(strcasecompare("version", name)) { - strstore(&co->version, whatptr); - if(!co->version) { - badcookie = TRUE; - break; - } + /* just ignore */ } else if(strcasecompare("max-age", name)) { /* @@ -1091,7 +1086,6 @@ free(clist->path); free(clist->spath); free(clist->expirestr); - free(clist->version); free(clist->maxage); *clist = *co; /* then store all the new data */ @@ -1169,9 +1163,6 @@ c = calloc(1, sizeof(struct CookieInfo)); if(!c) return NULL; /* failed to get memory */ - c->filename = strdup(file?file:"none"); /* copy the name just in case */ - if(!c->filename) - goto fail; /* failed to get memory */ /* * Initialize the next_expiration time to signal that we don't have enough * information yet. @@ -1322,7 +1313,6 @@ CLONE(name); CLONE(value); CLONE(maxage); - CLONE(version); d->expires = src->expires; d->tailmatch = src->tailmatch; d->secure = src->secure; @@ -1532,7 +1522,6 @@ { if(c) { unsigned int i; - free(c->filename); for(i = 0; i < COOKIE_HASH_SIZE; i++) Curl_cookie_freelist(c->cookies[i]); free(c); /* free the base struct as well */ --- a/lib/cookie.h +++ b/lib/cookie.h @@ -34,11 +34,7 @@ char *domain; /* domain = <this> */ curl_off_t expires; /* expires = <this> */ char *expirestr; /* the plain text version */ - - /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ - char *version; /* Version = <value> */ char *maxage; /* Max-Age = <value> */ - bool tailmatch; /* whether we do tail-matching of the domain name */ bool secure; /* whether the 'secure' keyword was used */ bool livecookie; /* updated from a server, not a stored file */ @@ -54,18 +50,17 @@ #define COOKIE_PREFIX__SECURE (1<<0) #define COOKIE_PREFIX__HOST (1<<1) -#define COOKIE_HASH_SIZE 256 +#define COOKIE_HASH_SIZE 63 struct CookieInfo { /* linked list of cookies we know of */ struct Cookie *cookies[COOKIE_HASH_SIZE]; - char *filename; /* file we read from/write to */ - long numcookies; /* number of cookies in the "jar" */ + curl_off_t next_expiration; /* the next time at which expiration happens */ + int numcookies; /* number of cookies in the "jar" */ + int lastct; /* last creation-time used in the jar */ bool running; /* state info, for cookie adding information */ bool newsession; /* new session, discard session cookies on load */ - int lastct; /* last creation-time used in the jar */ - curl_off_t next_expiration; /* the next time at which expiration happens */ }; /* This is the maximum line length we accept for a cookie line. RFC 2109 --- a/lib/easy.c +++ b/lib/easy.c @@ -848,9 +848,7 @@ if(data->cookies) { /* If cookies are enabled in the parent handle, we enable them in the clone as well! */ - outcurl->cookies = Curl_cookie_init(data, - data->cookies->filename, - outcurl->cookies, + outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, data->set.cookiesession); if(!outcurl->cookies) goto fail;
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.