This patch moves FTP::file to struct ftp_conn, because is has to be dealt with at connection cleanup, at which time the struct HandleData could be used by another connection. Also, the unused char *urlpath member is removed from struct FTP. --- lib/ftp.c | 79 +++++++++++++++++++++++++++++++++------------------------- lib/urldata.h | 3 -- 2 files changed, 47 insertions(+), 35 deletions(-) --- lib/urldata.h.orig +++ lib/urldata.h @@ -376,8 +376,6 @@ struct FTP { curl_off_t *bytecountp; char *user; /* user name string */ char *passwd; /* password string */ - char *urlpath; /* the originally given path part of the URL */ - char *file; /* decoded file */ /* transfer a file/body or not, done as a typedefed enum just to make debuggers display the full symbol and not just the numerical value */ @@ -392,6 +390,7 @@ struct ftp_conn { char **dirs; /* realloc()ed array for path components */ int dirdepth; /* number of entries used in the 'dirs' array */ int diralloc; /* number of entries allocated for the 'dirs' array */ + char *file; /* decoded file */ char *cache; /* data cache between getresponse()-calls */ curl_off_t cache_size; /* size of cache in bytes */ bool dont_check; /* Set to TRUE to prevent the final (post-transfer) --- lib/ftp.c.orig +++ lib/ftp.c @@ -275,9 +275,9 @@ static void freedirs(struct connectdata free(ftpc->dirs); ftpc->dirs = NULL; } - if(ftp->file) { - free(ftp->file); - ftp->file = NULL; + if(ftpc->file) { + free(ftpc->file); + ftpc->file = NULL; } } @@ -1340,8 +1340,9 @@ static CURLcode ftp_state_post_size(stru { CURLcode result = CURLE_OK; struct FTP *ftp = conn->data->reqdata.proto.ftp; + struct ftp_conn *ftpc = &conn->proto.ftpc; - if((ftp->transfer != FTPTRANSFER_BODY) && ftp->file) { + if((ftp->transfer != FTPTRANSFER_BODY) && ftpc->file) { /* if a "head"-like request is being made (on a file) */ /* Determine if server can respond to REST command and therefore @@ -1360,12 +1361,13 @@ static CURLcode ftp_state_post_type(stru { CURLcode result = CURLE_OK; struct FTP *ftp = conn->data->reqdata.proto.ftp; + struct ftp_conn *ftpc = &conn->proto.ftpc; - if((ftp->transfer == FTPTRANSFER_INFO) && ftp->file) { + if((ftp->transfer == FTPTRANSFER_INFO) && ftpc->file) { /* if a "head"-like request is being made (on a file) */ - /* we know ftp->file is a valid pointer to a file name */ - NBFTPSENDF(conn, "SIZE %s", ftp->file); + /* we know ftpc->file is a valid pointer to a file name */ + NBFTPSENDF(conn, "SIZE %s", ftpc->file); state(conn, FTP_SIZE); } @@ -1467,11 +1469,12 @@ static CURLcode ftp_state_post_mdtm(stru CURLcode result = CURLE_OK; struct FTP *ftp = conn->data->reqdata.proto.ftp; struct SessionHandle *data = conn->data; + struct ftp_conn *ftpc = &conn->proto.ftpc; /* If we have selected NOBODY and HEADER, it means that we only want file information. Which in FTP can't be much more than the file size and date. */ - if(conn->bits.no_body && ftp->file && + if(conn->bits.no_body && ftpc->file && ftp_need_type(conn, data->set.prefer_ascii)) { /* The SIZE command is _not_ RFC 959 specified, and therefor many servers may not support it! It is however the only way we have to get a file's @@ -1499,13 +1502,14 @@ static CURLcode ftp_state_post_cwd(struc CURLcode result = CURLE_OK; struct FTP *ftp = conn->data->reqdata.proto.ftp; struct SessionHandle *data = conn->data; + struct ftp_conn *ftpc = &conn->proto.ftpc; /* Requested time of file or time-depended transfer? */ - if((data->set.get_filetime || data->set.timecondition) && ftp->file) { + if((data->set.get_filetime || data->set.timecondition) && ftpc->file) { /* we have requested to get the modified-time of the file, this is a white spot as the MDTM is not mentioned in RFC959 */ - NBFTPSENDF(conn, "MDTM %s", ftp->file); + NBFTPSENDF(conn, "MDTM %s", ftpc->file); state(conn, FTP_MDTM); } @@ -1523,6 +1527,7 @@ static CURLcode ftp_state_ul_setup(struc CURLcode result = CURLE_OK; struct FTP *ftp = conn->data->reqdata.proto.ftp; struct SessionHandle *data = conn->data; + struct ftp_conn *ftpc = &conn->proto.ftpc; curl_off_t passed=0; if((data->reqdata.resume_from && !sizechecked) || @@ -1542,7 +1547,7 @@ static CURLcode ftp_state_ul_setup(struc if(data->reqdata.resume_from < 0 ) { /* Got no given size to start from, figure it out */ - NBFTPSENDF(conn, "SIZE %s", ftp->file); + NBFTPSENDF(conn, "SIZE %s", ftpc->file); state(conn, FTP_STOR_SIZE); return result; } @@ -1597,7 +1602,7 @@ static CURLcode ftp_state_ul_setup(struc } /* resume_from */ NBFTPSENDF(conn, data->set.ftp_append?"APPE %s":"STOR %s", - ftp->file); + ftpc->file); state(conn, FTP_STOR); @@ -1660,7 +1665,7 @@ static CURLcode ftp_state_quote(struct c if (ftp->transfer != FTPTRANSFER_BODY) state(conn, FTP_STOP); else { - NBFTPSENDF(conn, "SIZE %s", ftp->file); + NBFTPSENDF(conn, "SIZE %s", ftpc->file); state(conn, FTP_RETR_SIZE); } break; @@ -1962,6 +1967,7 @@ static CURLcode ftp_state_mdtm_resp(stru CURLcode result = CURLE_OK; struct SessionHandle *data=conn->data; struct FTP *ftp = data->reqdata.proto.ftp; + struct ftp_conn *ftpc = &conn->proto.ftpc; switch(ftpcode) { case 213: @@ -1987,7 +1993,7 @@ static CURLcode ftp_state_mdtm_resp(stru we "emulate" a HTTP-style header in our output. */ if(conn->bits.no_body && - ftp->file && + ftpc->file && data->set.get_filetime && (data->info.filetime>=0) ) { struct tm *tm; @@ -2093,6 +2099,7 @@ static CURLcode ftp_state_post_retr_size CURLcode result = CURLE_OK; struct SessionHandle *data=conn->data; struct FTP *ftp = data->reqdata.proto.ftp; + struct ftp_conn *ftpc = &conn->proto.ftpc; if (data->set.max_filesize && (filesize > data->set.max_filesize)) { failf(data, "Maximum file size exceeded"); @@ -2161,7 +2168,7 @@ static CURLcode ftp_state_post_retr_size } else { /* no resume */ - NBFTPSENDF(conn, "RETR %s", ftp->file); + NBFTPSENDF(conn, "RETR %s", ftpc->file); state(conn, FTP_RETR); } @@ -2211,6 +2218,7 @@ static CURLcode ftp_state_rest_resp(stru { CURLcode result = CURLE_OK; struct FTP *ftp = conn->data->reqdata.proto.ftp; + struct ftp_conn *ftpc = &conn->proto.ftpc; switch(instate) { case FTP_REST: @@ -2232,7 +2240,7 @@ static CURLcode ftp_state_rest_resp(stru result = CURLE_FTP_COULDNT_USE_REST; } else { - NBFTPSENDF(conn, "RETR %s", ftp->file); + NBFTPSENDF(conn, "RETR %s", ftpc->file); state(conn, FTP_RETR); } break; @@ -3182,7 +3190,7 @@ static CURLcode Curl_ftp_done(struct con ftpc->prevpath = NULL; /* no path */ } else { - size_t flen = ftp->file?strlen(ftp->file):0; /* file is "raw" already */ + size_t flen = ftpc->file?strlen(ftpc->file):0; /* file is "raw" already */ size_t dlen = strlen(path)-flen; if(!ftpc->cwdfail) { if(dlen && (data->set.ftp_filemethod != FTPFILE_NOCWD)) { @@ -3475,6 +3483,7 @@ static CURLcode ftp_range(struct connect static CURLcode Curl_ftp_nextconnect(struct connectdata *conn) { struct SessionHandle *data=conn->data; + struct ftp_conn *ftpc = &conn->proto.ftpc; CURLcode result = CURLE_OK; /* the ftp struct is inited in Curl_ftp_connect() */ @@ -3498,7 +3507,7 @@ static CURLcode Curl_ftp_nextconnect(str result = ftp_range(conn); if(result) ; - else if(data->set.ftp_list_only || !ftp->file) { + else if(data->set.ftp_list_only || !ftpc->file) { /* The specified path ends with a slash, and therefore we think this is a directory that is requested, use LIST. But before that we need to set ASCII transfer mode. */ @@ -3800,12 +3809,16 @@ static CURLcode Curl_ftp_disconnect(stru */ /* The FTP session may or may not have been allocated/setup at this point! */ + /* FIXME: checking for conn->data->reqdata.proto.ftp is not correct here, + * the reqdata structure could be used by another connection already */ if(conn->data->reqdata.proto.ftp) { (void)ftp_quit(conn); /* ignore errors on the QUIT */ if(ftpc->entrypath) { struct SessionHandle *data = conn->data; - data->state.most_recent_ftp_entrypath = NULL; + if (data->state.most_recent_ftp_entrypath == ftpc->entrypath) { + data->state.most_recent_ftp_entrypath = NULL; + } free(ftpc->entrypath); ftpc->entrypath = NULL; } @@ -3861,11 +3874,11 @@ CURLcode ftp_parse_url_path(struct conne if(data->reqdata.path && data->reqdata.path[0] && (data->reqdata.path[strlen(data->reqdata.path) - 1] != '/') ) - ftp->file = data->reqdata.path; /* this is a full file path */ + ftpc->file = data->reqdata.path; /* this is a full file path */ else - ftp->file = NULL; + ftpc->file = NULL; /* - ftp->file is not used anywhere other than for operations on a file. + ftpc->file is not used anywhere other than for operations on a file. In other words, never for directory operations. So we can safely set it to NULL here and use it as a argument in dir/file decisions. @@ -3877,7 +3890,7 @@ CURLcode ftp_parse_url_path(struct conne if(!path_to_use[0]) { /* no dir, no file */ ftpc->dirdepth = 0; - ftp->file = NULL; + ftpc->file = NULL; break; } slash_pos=strrchr(cur_pos, '/'); @@ -3894,10 +3907,10 @@ CURLcode ftp_parse_url_path(struct conne return CURLE_OUT_OF_MEMORY; } ftpc->dirdepth = 1; /* we consider it to be a single dir */ - ftp->file = slash_pos ? slash_pos+1 : cur_pos; /* rest is file name */ + ftpc->file = slash_pos ? slash_pos+1 : cur_pos; /* rest is file name */ } else - ftp->file = cur_pos; /* this is a file name only */ + ftpc->file = cur_pos; /* this is a file name only */ break; default: /* allow pretty much anything */ @@ -3959,26 +3972,26 @@ CURLcode ftp_parse_url_path(struct conne } } } - ftp->file = cur_pos; /* the rest is the file name */ + ftpc->file = cur_pos; /* the rest is the file name */ } - if(ftp->file && *ftp->file) { - ftp->file = curl_easy_unescape(conn->data, ftp->file, 0, NULL); - if(NULL == ftp->file) { + if(ftpc->file && *ftpc->file) { + ftpc->file = curl_easy_unescape(conn->data, ftpc->file, 0, NULL); + if(NULL == ftpc->file) { freedirs(conn); failf(data, "no memory"); return CURLE_OUT_OF_MEMORY; } - if (isBadFtpString(ftp->file)) { + if (isBadFtpString(ftpc->file)) { freedirs(conn); return CURLE_URL_MALFORMAT; } } else - ftp->file=NULL; /* instead of point to a zero byte, we make it a NULL + ftpc->file=NULL; /* instead of point to a zero byte, we make it a NULL pointer */ - if(data->set.upload && !ftp->file && (ftp->transfer == FTPTRANSFER_BODY)) { + if(data->set.upload && !ftpc->file && (ftp->transfer == FTPTRANSFER_BODY)) { /* We need a file name when uploading. Return error! */ failf(data, "Uploading to a URL without a file name!"); return CURLE_URL_MALFORMAT; @@ -3995,7 +4008,7 @@ CURLcode ftp_parse_url_path(struct conne return CURLE_OUT_OF_MEMORY; } - dlen = strlen(path) - (ftp->file?strlen(ftp->file):0); + dlen = strlen(path) - (ftpc->file?strlen(ftpc->file):0); if((dlen == strlen(ftpc->prevpath)) && curl_strnequal(path, ftpc->prevpath, dlen)) { infof(data, "Request has same path as previous transfer\n");