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

cookies: only save the cookie file if the engine is enabled

Browse source 
Follow-up to 8eddb8f425.

If the cookieinfo pointer is NULL there really is nothing to save.

Without this fix, we got a problem when a handle was using shared object
with cookies and is told to "FLUSH" it to file (which worked) and then
the share object was removed and when the easy handle was closed just
afterwards it has no cookieinfo and no cookies so it decided to save an
empty jar (overwriting the file just flushed).

Test 1905 now verifies that this works.

Assisted-by: Michael Wallner
Assisted-by: Marcel Raad

Closes #3621
This commit is contained in:
Daniel Stenberg 2019-02-26 16:35:07 +01:00
parent 0f6c6efd81
commit eb43338941
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 165 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/cookie.c
View file

@ -1541,9 +1541,12 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere)
unsigned int j;
struct Cookie **array;
if(!c)
/* no cookie engine alive */
return 0;
/* at first, remove expired cookies */
if(c)
remove_expired(c);
remove_expired(c);
if(!strcmp("-", dumphere)) {
/* use stdout */
@ -1562,7 +1565,7 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere)
"# This file was generated by libcurl! Edit at your own risk.\n\n",
out);
if(c && c->numcookies) {
if(c->numcookies) {
array = malloc(sizeof(struct Cookie *) * c->numcookies);
if(!array) {
if(!use_stdout)