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

ftplistparser.c: fix handling of file LISTings using Windows EOL

Browse Source 
Previously file.txt[CR][LF] would have been returned as file.tx
(without the last t) if filetype is symlink. Now the t is
included and the internal item_length includes the zero byte.

Spotted using test 576 on Windows.
This commit is contained in:
Marc Hoersken
2015-12-23 14:19:36 +01:00
parent fcabed6cd8
commit 7cbe4d8d79
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ftplistparser.c
View File

@@ -728,7 +728,6 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
case PL_UNIX_FILENAME_NAME: case PL_UNIX_FILENAME_NAME:
parser->item_length++; parser->item_length++;
if(c == '\r') { if(c == '\r') {
parser->item_length--;
parser->state.UNIX.sub.filename = PL_UNIX_FILENAME_WINDOWSEOL; parser->state.UNIX.sub.filename = PL_UNIX_FILENAME_WINDOWSEOL;
} }
else if(c == '\n') { else if(c == '\n') {
@@ -744,7 +743,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
break; break;
case PL_UNIX_FILENAME_WINDOWSEOL: case PL_UNIX_FILENAME_WINDOWSEOL:
if(c == '\n') { if(c == '\n') {
finfo->b_data[parser->item_offset + parser->item_length] = 0; finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;
parser->offsets.filename = parser->item_offset; parser->offsets.filename = parser->item_offset;
parser->state.UNIX.main = PL_UNIX_FILETYPE; parser->state.UNIX.main = PL_UNIX_FILETYPE;
result = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
@@ -837,7 +836,6 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
case PL_UNIX_SYMLINK_TARGET: case PL_UNIX_SYMLINK_TARGET:
parser->item_length++; parser->item_length++;
if(c == '\r') { if(c == '\r') {
parser->item_length --;
parser->state.UNIX.sub.symlink = PL_UNIX_SYMLINK_WINDOWSEOL; parser->state.UNIX.sub.symlink = PL_UNIX_SYMLINK_WINDOWSEOL;
} }
else if(c == '\n') { else if(c == '\n') {