moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

ftplistparser.c: avoid some invalid dereferences

This commit is contained in:
Kamil Dudka 2010-06-02 23:22:38 +02:00
parent c072bd4609
commit 475c19c42b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ftplistparser.c
View File

@ -341,7 +341,7 @@ static CURLcode ftp_pl_insert_finfo(struct connectdata *conn,
/* filter pattern-corresponding filenames */
if(compare(conn->data->set.fnmatch_data, wc->pattern, finfo->filename) == 0) {
/* discard symlink which is containing multiple " -> " */
if((finfo->filetype == CURLFILETYPE_SYMLINK) &&
if((finfo->filetype == CURLFILETYPE_SYMLINK) && finfo->strings.target
(strstr(finfo->strings.target, " -> "))) {
add = FALSE;
}
@ -424,6 +424,9 @@ size_t ftp_parselist(char *buffer, size_t size, size_t nmemb, void *connptr)
else {
Curl_fileinfo_dtor(NULL, parser->file_data);
parser->file_data = NULL;
parser->error = CURLE_OUT_OF_MEMORY;
PL_ERROR(conn, CURLE_OUT_OF_MEMORY);
return bufflen;
}
}
@ -937,7 +940,7 @@ size_t ftp_parselist(char *buffer, size_t size, size_t nmemb, void *connptr)
PL_ERROR(conn, CURLE_FTP_BAD_FILE_LIST);
return bufflen;
}
/* correct file size */
/* correct file type */
parser->file_data->filetype = CURLFILETYPE_FILE;
}