and fix another flaw in the singlecwd case when we get ftp://site.com/, also
from the #1739100 bug report
This commit is contained in:
@@ -3691,6 +3691,12 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
|
||||
|
||||
case FTPFILE_SINGLECWD:
|
||||
/* get the last slash */
|
||||
if(!path_to_use[0]) {
|
||||
/* no dir, no file */
|
||||
ftpc->dirdepth = 0;
|
||||
ftp->file = NULL;
|
||||
break;
|
||||
}
|
||||
slash_pos=strrchr(cur_pos, '/');
|
||||
if(slash_pos || !*cur_pos) {
|
||||
ftpc->dirs = (char **)calloc(1, sizeof(ftpc->dirs[0]));
|
||||
@@ -3773,7 +3779,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
|
||||
ftp->file = cur_pos; /* the rest is the file name */
|
||||
}
|
||||
|
||||
if(*ftp->file) {
|
||||
if(ftp->file && *ftp->file) {
|
||||
ftp->file = curl_easy_unescape(conn->data, ftp->file, 0, NULL);
|
||||
if(NULL == ftp->file) {
|
||||
freedirs(conn);
|
||||
|
Reference in New Issue
Block a user