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

ftp: add extra buffer length check

Browse source 
This adds an extra check that the buffer really has data enough (at
least 4 bytes) to check for a status code before doing so. It *should*
not be necessary, but this was pointed out by an analyzer and it feels
better to make sure.

Reported-by: Joshua Rogers
Closes #18869
This commit is contained in:
Daniel Stenberg 2025-10-06 10:11:30 +02:00
parent 9e3c35a88e
commit 172e190c79
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ftp.c
View file

@ -479,13 +479,14 @@ static CURLcode ftp_check_ctrl_on_data_wait(struct Curl_easy *data,
infof(data, "Ctrl conn has data while waiting for data conn");
if(pp->overflow > 3) {
const char *r = curlx_dyn_ptr(&pp->recvbuf);
size_t len = curlx_dyn_len(&pp->recvbuf);
DEBUGASSERT((pp->overflow + pp->nfinal) <=
curlx_dyn_len(&pp->recvbuf));
DEBUGASSERT((pp->overflow + pp->nfinal) <= curlx_dyn_len(&pp->recvbuf));
/* move over the most recently handled response line */
r += pp->nfinal;
len -= pp->nfinal;
if(LASTLINE(r)) {
if((len > 3) && LASTLINE(r)) {
curl_off_t status;
if(!curlx_str_number(&r, &status, 999) && (status == 226)) {
/* funny timing situation where we get the final message on the