luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ws: handle reads before EAGAIN better

Browse Source 
Reported-by: simplerobot on github
Fixes #10831
Closes #10856
This commit is contained in:
Daniel Stenberg 2023-03-28 17:44:59 +02:00
parent baeaeecb0a
commit b19cbebbb4
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ws.c
View File

@ -425,11 +425,11 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
size_t datalen;
unsigned int recvflags;
if(!wsp->stillblen) {
if(!wsp->stillblen || (result == CURLE_AGAIN)) {
/* try to get more data */
size_t n;
result = curl_easy_recv(data, data->state.buffer,
data->set.buffer_size, &n);
result = curl_easy_recv(data, &data->state.buffer[wsp->stillblen],
data->set.buffer_size - wsp->stillblen, &n);
if(result)
return result;
if(!n) {
@ -438,10 +438,10 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
return CURLE_GOT_NOTHING;
}
wsp->stillb = data->state.buffer;
wsp->stillblen = n;
wsp->stillblen += n;
}
infof(data, "WS: %u bytes left to decode", (int)wsp->stillblen);
infof(data, "WS: %zu bytes left to decode", wsp->stillblen);
if(!wsp->frame.bytesleft) {
size_t headlen;
curl_off_t oleft;
@ -449,8 +449,8 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
result = ws_decode(data, (unsigned char *)wsp->stillb, wsp->stillblen,
&headlen, &datalen, &oleft, &recvflags);
if(result == CURLE_AGAIN)
/* a packet fragment only */
break;
/* a packet fragment only, loop and try reading more */
continue;
else if(result)
return result;
if(datalen > buflen) {