From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 20 Oct 2024 20:29:08 +0000 (+0200)
Subject: curl_ws_recv: return recv 0 and point meta to NULL on all errors
X-Git-Tag: curl-8_11_0~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6bae1cb8f3f5cf333d9133b47c22c4875819eb4;p=thirdparty%2Fcurl.git

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

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

Closes #15342
---

diff --git a/lib/ws.c b/lib/ws.c
index bfdab3af0a..3d739a538a 100644
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -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;