diff options
author | Jay Satiro <raysatiro@yahoo.com> | 2019-07-23 17:59:18 -0400 |
---|---|---|
committer | Jay Satiro <raysatiro@yahoo.com> | 2019-07-25 22:24:06 -0400 |
commit | 78ed3abe11de0d8fe465dee6d1de0c1b973f4409 (patch) | |
tree | a03e9b93f0b8131930579dbb6ee862ff6b29c678 | |
parent | fd5ab4358f09fafc83fc82ffd88c2c0b1c534c15 (diff) |
easy: resize receive buffer on easy handle reset
- In curl_easy_reset attempt to resize the receive buffer to its default
size. If realloc fails then continue using the previous size.
Prior to this change curl_easy_reset did not properly handle resetting
the receive buffer (data->state.buffer). It reset the variable holding
its size (data->set.buffer_size) to the default size (READBUFFER_SIZE)
but then did not actually resize the buffer. If a user resized the
buffer by using CURLOPT_BUFFERSIZE to set the size smaller than the
default, later called curl_easy_reset and attempted to reuse the handle
then a heap overflow would very likely occur during that handle's next
transfer.
Reported-by: Felix Hädicke
Fixes https://github.com/curl/curl/issues/4143
Closes https://github.com/curl/curl/pull/4145
-rw-r--r-- | lib/easy.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/easy.c b/lib/easy.c index a4fff5b36..616ad28b8 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -942,6 +942,8 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) */ void curl_easy_reset(struct Curl_easy *data) { + long old_buffer_size = data->set.buffer_size; + Curl_free_request_state(data); /* zero out UserDefined data: */ @@ -965,6 +967,18 @@ void curl_easy_reset(struct Curl_easy *data) #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) Curl_http_auth_cleanup_digest(data); #endif + + /* resize receive buffer */ + if(old_buffer_size != data->set.buffer_size) { + char *newbuff = realloc(data->state.buffer, data->set.buffer_size + 1); + if(!newbuff) { + DEBUGF(fprintf(stderr, "Error: realloc of buffer failed\n")); + /* nothing we can do here except use the old size */ + data->set.buffer_size = old_buffer_size; + } + else + data->state.buffer = newbuff; + } } /* |