mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

ws: fix Coverity complaints

Browse Source 
Coverity pointed out several flaws where variables remained
uninitialized after forks.

Follow-up to e3f335148a

Closes #9666
This commit is contained in:
Daniel Stenberg 2022-10-07 14:07:46 +02:00
parent 187f152a1d
commit c02291fd47
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/ws.c
View File

@ -332,9 +332,8 @@ size_t Curl_ws_writecb(char *buffer, size_t size /* 1 */,
if(data->set.ws_raw_mode) if(data->set.ws_raw_mode)
return data->set.fwrite_func(buffer, size, nitems, writebody_ptr); return data->set.fwrite_func(buffer, size, nitems, writebody_ptr);
else if(nitems) { else if(nitems) {
unsigned char *frame; unsigned char *frame = NULL;
size_t flen; size_t flen = 0;
unsigned int recvflags;
CURLcode result; CURLcode result;
unsigned char *endp; unsigned char *endp;
curl_off_t oleft; curl_off_t oleft;
@ -343,6 +342,7 @@ size_t Curl_ws_writecb(char *buffer, size_t size /* 1 */,
oleft = ws->ws.frame.bytesleft; oleft = ws->ws.frame.bytesleft;
if(!oleft) { if(!oleft) {
unsigned int recvflags;
result = ws_decode(data, (unsigned char *)buffer, nitems, result = ws_decode(data, (unsigned char *)buffer, nitems,
&frame, &flen, &oleft, &endp, &recvflags); &frame, &flen, &oleft, &endp, &recvflags);
if(result == CURLE_AGAIN) if(result == CURLE_AGAIN)
@ -360,12 +360,22 @@ size_t Curl_ws_writecb(char *buffer, size_t size /* 1 */,
ws->ws.frame.bytesleft = oleft; ws->ws.frame.bytesleft = oleft;
} }
else { else {
if(nitems > (size_t)ws->ws.frame.bytesleft) {
nitems = ws->ws.frame.bytesleft;
endp = (unsigned char *)&buffer[nitems];
}
else
endp = NULL;
ws->ws.frame.offset += nitems;
ws->ws.frame.bytesleft -= nitems; ws->ws.frame.bytesleft -= nitems;
frame = (unsigned char *)buffer;
flen = nitems;
} }
/* auto-respond to PINGs */ if((ws->ws.frame.flags & CURLWS_PING) && !oleft) {
if((recvflags & CURLWS_PING) && !oleft) { /* auto-respond to PINGs, only works for single-frame payloads atm */
size_t bytes; size_t bytes;
infof(data, "WS: auto-respond to PING with a PONG"); infof(data, "WS: auto-respond to PING with a PONG");
DEBUGASSERT(frame);
/* send back the exact same content as a PONG */ /* send back the exact same content as a PONG */
result = curl_ws_send(data, frame, flen, &bytes, 0, CURLWS_PONG); result = curl_ws_send(data, frame, flen, &bytes, 0, CURLWS_PONG);
if(result) if(result)
@ -442,6 +452,7 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
} }
else { else {
olen = oleft; olen = oleft;
out = (unsigned char *)wsp->stillb;
recvflags = wsp->frame.flags; recvflags = wsp->frame.flags;
if((curl_off_t)buflen < oleft) if((curl_off_t)buflen < oleft)
/* there is still data left after this */ /* there is still data left after this */
@ -573,7 +584,7 @@ static size_t ws_packethead(struct Curl_easy *data,
out[3] = len & 0xff; out[3] = len & 0xff;
outi = 10; outi = 10;
} }
if(len > 126) { else if(len > 126) {
out[1] = 126 | WSBIT_MASK; out[1] = 126 | WSBIT_MASK;
out[2] = (len >> 8) & 0xff; out[2] = (len >> 8) & 0xff;
out[3] = len & 0xff; out[3] = len & 0xff;