diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2017-05-13 22:54:59 +0200 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2017-05-13 23:21:27 +0200 |
| commit | d836c9fee4bbef249dc7bf281336fb41eb3b77c7 (patch) | |
| tree | 9cacfac0b0e7c044d1dabaf946ab3d0e9a1dbdb7 | |
| parent | b1fa80b84facb94a667a6bfaa99476a161285b0d (diff) | |
url.c: add a compile-time check that CURL_MAX_WRITE_SIZE is large enough
Some code (e.g. Curl_fillreadbuffer) assumes that this buffer is not
exceedingly tiny and will break if it is. This same check is already
done at run time in the CURLOPT_BUFFERSIZE option.
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 | 3 | ||||
| -rw-r--r-- | lib/url.c | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 b/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 index 5d9b065af..b4100e607 100644 --- a/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 +++ b/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 @@ -37,7 +37,8 @@ This is just treated as a request, not an order. You cannot be guaranteed to actually get the given size. This buffer size is by default \fICURL_MAX_WRITE_SIZE\fP (16kB). The maximum -buffer size allowed to set is \fICURL_MAX_READ_SIZE\fP (512kB). +buffer size allowed to be set is \fICURL_MAX_READ_SIZE\fP (512kB). The minimum +buffer size allowed to be set is 1024. .SH DEFAULT CURL_MAX_WRITE_SIZE (16kB) .SH PROTOCOLS @@ -144,6 +144,15 @@ static unsigned int get_protocol_family(unsigned int protocol); #define READBUFFER_MAX CURL_MAX_READ_SIZE #define READBUFFER_MIN 1024 +/* Some parts of the code (e.g. chunked encoding) assume this buffer has at + * more than just a few bytes to play with. Don't let it become too small or + * bad things will happen. + */ +#if READBUFFER_SIZE < READBUFFER_MIN +# error READBUFFER_SIZE is too small +#endif + + /* * Protocol table. */ |