From 9c3eda660df9a41b7ca9a1008178f7edecdb91ae Mon Sep 17 00:00:00 2001 From: Sébastien Helleu Date: Thu, 25 Apr 2024 20:20:40 +0200 Subject: relay: remove check of NULL pointers before calling relay_websocket_deflate_free() (issue #865) --- src/plugins/relay/relay-http.c | 3 +-- tests/unit/plugins/relay/test-relay-websocket.cpp | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/relay/relay-http.c b/src/plugins/relay/relay-http.c index aff6a1ac7..591ae4ad8 100644 --- a/src/plugins/relay/relay-http.c +++ b/src/plugins/relay/relay-http.c @@ -1337,8 +1337,7 @@ relay_http_request_free (struct t_relay_http_request *request) free (request->http_version); weechat_hashtable_free (request->headers); weechat_hashtable_free (request->accept_encoding); - if (request->ws_deflate) - relay_websocket_deflate_free (request->ws_deflate); + relay_websocket_deflate_free (request->ws_deflate); free (request->body); free (request); diff --git a/tests/unit/plugins/relay/test-relay-websocket.cpp b/tests/unit/plugins/relay/test-relay-websocket.cpp index 230d875db..38799c059 100644 --- a/tests/unit/plugins/relay/test-relay-websocket.cpp +++ b/tests/unit/plugins/relay/test-relay-websocket.cpp @@ -84,6 +84,9 @@ TEST(RelayWebsocket, DeflateAllocFree) POINTERS_EQUAL(NULL, ws_deflate->strm_inflate); relay_websocket_deflate_free (ws_deflate); + + /* test free of NULL websocket deflate */ + relay_websocket_deflate_free (NULL); } /* -- cgit v1.2.3-59-g8ed1b