moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

call Curl_done() in Curl_perform() after Transfer() was called, even it it

Browse Source 
returned an error as there might be stuff in there we must free/cleanup.
This fixes the memory leak Yanick Pelletier posted about 16 Oct 2001
This commit is contained in:
Daniel Stenberg 2001-10-17 12:24:51 +00:00
parent 8dd6a4e369
commit db0e3cc60c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/transfer.c
View File

@ -926,6 +926,8 @@ CURLcode Curl_perform(struct SessionHandle *data)
if(res == CURLE_OK) { if(res == CURLE_OK) {
res = Curl_do(conn); res = Curl_do(conn);
if(res == CURLE_OK) { if(res == CURLE_OK) {
CURLcode res2; /* just a local extra result container */
if(conn->protocol&PROT_FTPS) if(conn->protocol&PROT_FTPS)
/* FTPS, disable ssl while transfering data */ /* FTPS, disable ssl while transfering data */
conn->ssl.use = FALSE; conn->ssl.use = FALSE;
@ -934,15 +936,19 @@ CURLcode Curl_perform(struct SessionHandle *data)
/* FTPS, enable ssl again after havving transferred data */ /* FTPS, enable ssl again after havving transferred data */
conn->ssl.use = TRUE; conn->ssl.use = TRUE;
if(res == CURLE_OK) { if(res == CURLE_OK)
/* /*
* We must duplicate the new URL here as the connection data * We must duplicate the new URL here as the connection data
* may be free()ed in the Curl_done() function. * may be free()ed in the Curl_done() function.
*/ */
newurl = conn->newurl?strdup(conn->newurl):NULL; newurl = conn->newurl?strdup(conn->newurl):NULL;
res = Curl_done(conn); /* Always run Curl_done(), even if some of the previous calls
} failed, but return the previous (original) error code */
res2 = Curl_done(conn);
if(CURLE_OK == res)
res = res2;
} }
/* /*