]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
http: fix crash in rate-limited upload
authorJay Satiro <raysatiro@yahoo.com>
Tue, 29 Jun 2021 15:43:35 +0000 (11:43 -0400)
committerJay Satiro <raysatiro@yahoo.com>
Tue, 29 Jun 2021 19:18:08 +0000 (15:18 -0400)
- Don't set the size of the piece of data to send to the rate limit if
  that limit is larger than the buffer size that will hold the piece.

Prior to this change if CURLOPT_MAX_SEND_SPEED_LARGE
(curl tool: --limit-rate) was set then it was possible that a temporary
buffer used for uploading could be written to out of bounds. A likely
scenario for this would be a non-trivial amount of post data combined
with a rate limit larger than CURLOPT_UPLOAD_BUFFERSIZE (default 64k).

The bug was introduced in 24e469f which is in releases since 7.76.0.

perl -e "print '0' x 200000" > tmp
curl --limit-rate 128k -d @tmp httpbin.org/post

Reported-by: Richard Marion
Fixes https://github.com/curl/curl/issues/7308
Closes https://github.com/curl/curl/pull/7315

lib/http.c

index 6d5d8fb3b2b07d92267438ea83fd250136e1f90c..ac0301bc41b21de9eb405556eb9998ff3959ac38 100644 (file)
@@ -1177,6 +1177,7 @@ static size_t readmoredata(char *buffer,
   data->req.forbidchunk = (http->sending == HTTPSEND_REQUEST)?TRUE:FALSE;
 
   if(data->set.max_send_speed &&
+     (data->set.max_send_speed < (curl_off_t)fullsize) &&
      (data->set.max_send_speed < http->postsize))
     /* speed limit */
     fullsize = (size_t)data->set.max_send_speed;