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

curl_ws_recv: return recv 0 and point meta to NULL on all errors

Browse Source 
Previously it could accidentally return some errors without having reset
the values.

Closes #15342
This commit is contained in:
Daniel Stenberg 2024-10-20 22:29:08 +02:00
parent 2816cba2d7
commit d6bae1cb8f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ws.c
View File

@ -933,6 +933,9 @@ CURL_EXTERN CURLcode curl_ws_recv(CURL *d, void *buffer,
struct websocket *ws;
struct ws_collect ctx;
*nread = 0;
*metap = NULL;
if(!conn) {
/* Unhappy hack with lifetimes of transfers and connection */
if(!data->set.connect_only) {
@ -952,8 +955,6 @@ CURL_EXTERN CURLcode curl_ws_recv(CURL *d, void *buffer,
return CURLE_BAD_FUNCTION_ARGUMENT;
}
*nread = 0;
*metap = NULL;
memset(&ctx, 0, sizeof(ctx));
ctx.data = data;