From eb433389411f778ed8e6b516a5b8fa35d57564ef Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 26 Feb 2019 16:35:07 +0100 Subject: cookies: only save the cookie file if the engine is enabled Follow-up to 8eddb8f4259. 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 --- lib/cookie.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/cookie.c b/lib/cookie.c index a58ce2b35..65cc11732 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -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) -- cgit v1.2.3