summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2024-04-25 20:20:40 +0200
committerSébastien Helleu <flashcode@flashtux.org>2024-04-26 21:23:39 +0200
commit9c3eda660df9a41b7ca9a1008178f7edecdb91ae (patch)
tree2b5e61b222f127521284327da204e46537dd698d
parentrelay: remove check of NULL pointers before calling relay_server_free() (issue #865) (diff)
downloadweechat-9c3eda660df9a41b7ca9a1008178f7edecdb91ae.tar.xz
weechat-9c3eda660df9a41b7ca9a1008178f7edecdb91ae.zip
relay: remove check of NULL pointers before calling relay_websocket_deflate_free() (issue #865)
-rw-r--r--src/plugins/relay/relay-http.c3
-rw-r--r--tests/unit/plugins/relay/test-relay-websocket.cpp3
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);
}
/*