generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Armel Asselin fixed a crash in the FTP code when using SINGLECWD mode and

Browse Source 
files in the root directory.
This commit is contained in:
Daniel Stenberg 2006-08-18 23:17:33 +00:00
parent 490cccba3c
commit 74a6921bc4
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -7,6 +7,9 @@
Changelog Changelog
Daniel (19 August 2006) Daniel (19 August 2006)
- Armel Asselin fixed a crash in the FTP code when using SINGLECWD mode and
files in the root directory.
- Andrew Biggs pointed out a "Expect: 100-continue" flaw where libcurl didn't - Andrew Biggs pointed out a "Expect: 100-continue" flaw where libcurl didn't
send the whole request at once, even though the Expect: header was disabled send the whole request at once, even though the Expect: header was disabled
by the application. An effect of this change is also that small (< 1024 by the application. An effect of this change is also that small (< 1024

2
RELEASE-NOTES
View File

@ -15,6 +15,8 @@ This release includes the following changes:
This release includes the following bugfixes: This release includes the following bugfixes:
o SINGLECWD mode and using files in the root dir
o Expect: header disabling work better
o "Expect: 100-continue" disable on second POST on re-used connection o "Expect: 100-continue" disable on second POST on re-used connection
o src/config.h.in is fixed o src/config.h.in is fixed

9
lib/ftp.c
View File

@ -3804,19 +3804,20 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
case FTPFILE_SINGLECWD: case FTPFILE_SINGLECWD:
/* get the last slash */ /* get the last slash */
slash_pos=strrchr(cur_pos, '/'); 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->dirdepth = 1; /* we consider it to be a single dir */
ftp->dirs = (char **)calloc(1, sizeof(ftp->dirs[0])); ftp->dirs = (char **)calloc(1, sizeof(ftp->dirs[0]));
if(!ftp->dirs) if(!ftp->dirs)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
ftp->dirs[0] = curl_easy_unescape(conn->data, cur_pos, ftp->dirs[0] = curl_easy_unescape(conn->data, slash_pos ? cur_pos : "/",
(int)(slash_pos-cur_pos), NULL); slash_pos?(int)(slash_pos-cur_pos):1,
NULL);
if(!ftp->dirs[0]) { if(!ftp->dirs[0]) {
free(ftp->dirs); free(ftp->dirs);
return CURLE_OUT_OF_MEMORY; 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 else
ftp->file = cur_pos; /* this is a file name only */ ftp->file = cur_pos; /* this is a file name only */