diff options
| -rw-r--r-- | lib/ftp.c | 16 | ||||
| -rw-r--r-- | lib/transfer.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 7 |
3 files changed, 16 insertions, 9 deletions
@@ -1720,12 +1720,14 @@ CURLcode Curl_ftp_disconnect(struct connectdata *conn) { struct FTP *ftp= conn->proto.ftp; - if(ftp->user) - free(ftp->user); - if(ftp->passwd) - free(ftp->passwd); - if(ftp->entrypath) - free(ftp->entrypath); - + /* The FTP session may or may not have been allocated/setup at this point! */ + if(ftp) { + if(ftp->user) + free(ftp->user); + if(ftp->passwd) + free(ftp->passwd); + if(ftp->entrypath) + free(ftp->entrypath); + } return CURLE_OK; } diff --git a/lib/transfer.c b/lib/transfer.c index 1f2c6886f..48706c544 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -955,7 +955,7 @@ CURLcode Curl_perform(CURL *curl) } while(1); /* loop if Location: */ - if(conn->newurl) { + if((CURLE_OK == res) && conn->newurl) { free(conn->newurl); conn->newurl = NULL; } @@ -816,6 +816,9 @@ CURLcode Curl_disconnect(struct connectdata *conn) free(conn->hostent_buf); #endif + if(conn->newurl) + free(conn->newurl); + if(conn->path) /* the URL path part */ free(conn->path); @@ -2147,8 +2150,10 @@ CURLcode Curl_connect(struct UrlData *data, /* We're not allowed to return failure with memory left allocated in the connectdata struct, free those here */ conn = (struct connectdata *)*in_connect; - if(conn) + if(conn) { Curl_disconnect(conn); /* close the connection */ + *in_connect = NULL; /* return a NULL */ + } } return code; } |