mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-15 06:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

easy/transfer: fix cookie-disabled build

Browse Source 
Follow-up from 45de940ceb
Reported-by: Marcel Raad
Fixes #8953
Closes #8954
This commit is contained in:
Daniel Stenberg 2022-06-02 15:45:27 +02:00
parent 07a9b89fed
commit 2bd75e5686
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/easy.c
View File

@ -838,6 +838,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
outcurl->progress.flags = data->progress.flags; outcurl->progress.flags = data->progress.flags;
outcurl->progress.callback = data->progress.callback; outcurl->progress.callback = data->progress.callback;
#ifndef CURL_DISABLE_COOKIES
if(data->cookies) { if(data->cookies) {
/* If cookies are enabled in the parent handle, we enable them /* If cookies are enabled in the parent handle, we enable them
in the clone as well! */ in the clone as well! */
@ -856,6 +857,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
if(!outcurl->state.cookielist) if(!outcurl->state.cookielist)
goto fail; goto fail;
} }
#endif
if(data->state.url) { if(data->state.url) {
outcurl->state.url = strdup(data->state.url); outcurl->state.url = strdup(data->state.url);
@ -937,8 +939,10 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
fail: fail:
if(outcurl) { if(outcurl) {
#ifndef CURL_DISABLE_COOKIES
curl_slist_free_all(outcurl->state.cookielist); curl_slist_free_all(outcurl->state.cookielist);
outcurl->state.cookielist = NULL; outcurl->state.cookielist = NULL;
#endif
Curl_safefree(outcurl->state.buffer); Curl_safefree(outcurl->state.buffer);
Curl_dyn_free(&outcurl->state.headerb); Curl_dyn_free(&outcurl->state.headerb);
Curl_safefree(outcurl->state.url); Curl_safefree(outcurl->state.url);

3
lib/transfer.c
View File

@ -1422,10 +1422,11 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
else else
data->state.infilesize = 0; data->state.infilesize = 0;
#ifndef CURL_DISABLE_COOKIES
/* If there is a list of cookie files to read, do it now! */ /* If there is a list of cookie files to read, do it now! */
if(data->state.cookielist) if(data->state.cookielist)
Curl_cookie_loadfiles(data); Curl_cookie_loadfiles(data);
#endif
/* If there is a list of host pairs to deal with */ /* If there is a list of host pairs to deal with */
if(data->state.resolve) if(data->state.resolve)
result = Curl_loadhostpairs(data); result = Curl_loadhostpairs(data);