curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-20 02:52:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

pingpong: use the set buffer size

Browse Source
This commit is contained in:
Daniel Stenberg 2017-04-25 00:50:04 +02:00
parent 504eafff86
commit b8191e975f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pingpong.c
View File

@ -286,7 +286,8 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd,
/* number of bytes in the current line, so far */ /* number of bytes in the current line, so far */
perline = (ssize_t)(ptr-pp->linestart_resp); perline = (ssize_t)(ptr-pp->linestart_resp);
while((pp->nread_resp<BUFSIZE) && (keepon && !result)) { while((pp->nread_resp < (size_t)data->set.buffer_size) &&
(keepon && !result)) {
if(pp->cache) { if(pp->cache) {
/* we had data in the "cache", copy that instead of doing an actual /* we had data in the "cache", copy that instead of doing an actual
@ -296,7 +297,7 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd,
* it would have been populated with something of size int to begin * it would have been populated with something of size int to begin
* with, even though its datatype may be larger than an int. * with, even though its datatype may be larger than an int.
*/ */
DEBUGASSERT((ptr+pp->cache_size) <= (buf+BUFSIZE+1)); DEBUGASSERT((ptr+pp->cache_size) <= (buf+data->set.buffer_size+1));
memcpy(ptr, pp->cache, pp->cache_size); memcpy(ptr, pp->cache, pp->cache_size);
gotbytes = (ssize_t)pp->cache_size; gotbytes = (ssize_t)pp->cache_size;
free(pp->cache); /* free the cache */ free(pp->cache); /* free the cache */
@ -308,8 +309,10 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd,
enum protection_level prot = conn->data_prot; enum protection_level prot = conn->data_prot;
conn->data_prot = PROT_CLEAR; conn->data_prot = PROT_CLEAR;
#endif #endif
DEBUGASSERT((ptr+BUFSIZE-pp->nread_resp) <= (buf+BUFSIZE+1)); DEBUGASSERT((ptr + data->set.buffer_size - pp->nread_resp) <=
result = Curl_read(conn, sockfd, ptr, BUFSIZE-pp->nread_resp, (buf + data->set.buffer_size + 1));
result = Curl_read(conn, sockfd, ptr,
data->set.buffer_size - pp->nread_resp,
&gotbytes); &gotbytes);
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI
DEBUGASSERT(prot > PROT_NONE && prot < PROT_LAST); DEBUGASSERT(prot > PROT_NONE && prot < PROT_LAST);
@ -402,7 +405,7 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd,
} }
else if(keepon) { else if(keepon) {
if((perline == gotbytes) && (gotbytes > BUFSIZE/2)) { if((perline == gotbytes) && (gotbytes > data->set.buffer_size/2)) {
/* We got an excessive line without newlines and we need to deal /* We got an excessive line without newlines and we need to deal
with it. We keep the first bytes of the line then we throw with it. We keep the first bytes of the line then we throw
away the rest. */ away the rest. */
@ -414,7 +417,7 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd,
interested in the first piece */ interested in the first piece */
clipamount = 40; clipamount = 40;
} }
else if(pp->nread_resp > BUFSIZE/2) { else if(pp->nread_resp > (size_t)data->set.buffer_size/2) {
/* We got a large chunk of data and there's potentially still /* We got a large chunk of data and there's potentially still
trailing data to take care of, so we put any such part in the trailing data to take care of, so we put any such part in the
"cache", clear the buffer to make space and restart. */ "cache", clear the buffer to make space and restart. */