Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP7:GA
curl.31880
curl-CVE-2023-38546.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File curl-CVE-2023-38546.patch of Package curl.31880
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 --- lib/cookie.c | 13 +------------ lib/cookie.h | 13 ++++--------- lib/easy.c | 4 +--- 3 files changed, 6 insertions(+), 24 deletions(-) Index: curl-8.0.1/lib/cookie.c =================================================================== --- curl-8.0.1.orig/lib/cookie.c +++ curl-8.0.1/lib/cookie.c @@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co free(co->name); free(co->value); free(co->maxage); - free(co->version); free(co); } @@ -726,11 +725,7 @@ Curl_cookie_add(struct Curl_easy *data, } } else if((nlen == 7) && strncasecompare("version", namep, 7)) { - strstore(&co->version, valuep, vlen); - if(!co->version) { - badcookie = TRUE; - break; - } + /* just ignore */ } else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { /* @@ -1174,7 +1169,6 @@ Curl_cookie_add(struct Curl_easy *data, free(clist->path); free(clist->spath); free(clist->expirestr); - free(clist->version); free(clist->maxage); *clist = *co; /* then store all the new data */ @@ -1238,9 +1232,6 @@ struct CookieInfo *Curl_cookie_init(stru 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. @@ -1394,7 +1385,6 @@ static struct Cookie *dup_cookie(struct CLONE(name); CLONE(value); CLONE(maxage); - CLONE(version); d->expires = src->expires; d->tailmatch = src->tailmatch; d->secure = src->secure; @@ -1611,7 +1601,6 @@ void Curl_cookie_cleanup(struct CookieIn { 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 */ Index: curl-8.0.1/lib/cookie.h =================================================================== --- curl-8.0.1.orig/lib/cookie.h +++ curl-8.0.1/lib/cookie.h @@ -36,11 +36,7 @@ struct Cookie { 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 */ @@ -56,18 +52,16 @@ struct Cookie { #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 Index: curl-8.0.1/lib/easy.c =================================================================== --- curl-8.0.1.orig/lib/easy.c +++ curl-8.0.1/lib/easy.c @@ -911,9 +911,7 @@ struct Curl_easy *curl_easy_duphandle(st 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
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor