mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

imap: Improved FETCH response parsing

Browse Source 
Added safer parsing of the untagged FETCH response line and the size of
continuation data.
This commit is contained in:
Jiri Hruska 2013-03-01 19:24:56 +01:00 committed by Steve Holme
parent be51a46353
commit 25884aa197
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/imap.c
View File

@ -1252,6 +1252,8 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
struct imap_conn *imapc = &conn->proto.imapc;
struct pingpong *pp = &imapc->pp;
const char *ptr = data->state.buffer;
bool parsed = FALSE;
curl_off_t size;
(void)instate; /* no use for this yet */
@ -1267,11 +1269,16 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
ptr++;
if(*ptr == '{') {
curl_off_t size = curlx_strtoofft(ptr + 1, NULL, 10);
if(size)
Curl_pgrsSetDownloadSize(data, size);
char *endptr;
size = curlx_strtoofft(ptr + 1, &endptr, 10);
if(endptr - ptr > 1 && endptr[0] == '}' &&
endptr[1] == '\r' && endptr[2] == '\0')
parsed = TRUE;
}
if(parsed) {
infof(data, "Found %" FORMAT_OFF_TU " bytes to download\n", size);
Curl_pgrsSetDownloadSize(data, size);
if(pp->cache) {
/* At this point there is a bunch of data in the header "cache" that is
@ -1316,9 +1323,11 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
data->req.maxdownload = size;
}
else
else {
/* We don't know how to parse this line */
failf(pp->conn->data, "Failed to parse FETCH response.");
result = CURLE_FTP_WEIRD_SERVER_REPLY; /* TODO: fix this code */
}
/* End of DO phase */
state(conn, IMAP_STOP);