From 74a6921bc454fcbf842a221e95ba5dc09b19049e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 18 Aug 2006 23:17:33 +0000 Subject: Armel Asselin fixed a crash in the FTP code when using SINGLECWD mode and files in the root directory. --- lib/ftp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/ftp.c') diff --git a/lib/ftp.c b/lib/ftp.c index a52ad56a8..e7d8b2269 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3804,19 +3804,20 @@ CURLcode ftp_parse_url_path(struct connectdata *conn) case FTPFILE_SINGLECWD: /* get the last slash */ slash_pos=strrchr(cur_pos, '/'); - if(slash_pos) { + if(slash_pos || !cur_pos || !*cur_pos) { ftp->dirdepth = 1; /* we consider it to be a single dir */ ftp->dirs = (char **)calloc(1, sizeof(ftp->dirs[0])); if(!ftp->dirs) return CURLE_OUT_OF_MEMORY; - ftp->dirs[0] = curl_easy_unescape(conn->data, cur_pos, - (int)(slash_pos-cur_pos), NULL); + ftp->dirs[0] = curl_easy_unescape(conn->data, slash_pos ? cur_pos : "/", + slash_pos?(int)(slash_pos-cur_pos):1, + NULL); if(!ftp->dirs[0]) { free(ftp->dirs); return CURLE_OUT_OF_MEMORY; } - ftp->file = slash_pos+1; /* the rest is the file name */ + ftp->file = slash_pos ? slash_pos+1 : cur_pos; /* rest is file name */ } else ftp->file = cur_pos; /* this is a file name only */ -- cgit v1.2.3