romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-18 17:36:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

ftp: simplify the 150/126 size scanner

Browse source 
The file size is weirdly returned in a 150 or 126 response as "XXX
bytes" mentioned somewhere in the response string. This is a rewrite of
the size scanner to replace the strange strstr() + backwards search from
before with a plain forward search until '[number] + " bytes"' is a
match.

Triggered by a report by Joshua Rogers about the previous parser.

Closes #18984
This commit is contained in:
Daniel Stenberg 2025-10-09 22:32:09 +02:00
parent eb3a4314fe
commit 6c0338115a
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/ftp.c
View file

@ -2496,30 +2496,19 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data,
* those cases only confuses us.
*
* Example D above makes this parsing a little tricky */
const char *bytes;
char *buf = curlx_dyn_ptr(&ftpc->pp.recvbuf);
bytes = strstr(buf, " bytes");
if(bytes) {
long in = (long)(--bytes-buf);
/* this is a hint there is size information in there! ;-) */
while(--in) {
/* scan for the left parenthesis and break there */
if('(' == *bytes)
break;
/* skip only digits */
if(!ISDIGIT(*bytes)) {
bytes = NULL;
size_t len = curlx_dyn_len(&ftpc->pp.recvbuf);
if(len >= 7) { /* "1 bytes" is 7 characters */
size_t i;
for(i = 0; i < len - 7; i++) {
curl_off_t what;
char *buf = curlx_dyn_ptr(&ftpc->pp.recvbuf);
const char *c = &buf[i];
if(!curlx_str_number(&c, &what, CURL_OFF_T_MAX) &&
!curlx_str_single(&c, ' ') &&
!strncmp(c, "bytes", 5)) {
size = what;
break;
}
/* one more estep backwards */
bytes--;
}
/* if we have nothing but digits: */
if(bytes) {
++bytes;
/* get the number! */
if(curlx_str_number(&bytes, &size, CURL_OFF_T_MAX))
size = 1;
}
}
}