From d6bae1cb8f3f5cf333d9133b47c22c4875819eb4 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 20 Oct 2024 22:29:08 +0200 Subject: [PATCH] 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 --- lib/ws.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; -- 2.47.3