ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cid#1546341 Resource leak on an exceptional path

Browse Source 
Change-Id: Ia4d91ecb2bbd1d325a801b0b40ab478dc5dd3102
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157560
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2023-10-05 09:36:55 +02:00
parent 86eb7ad2b4
commit e555ea5937
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/java_websocket/UnpackedTarball_java_websocket.mk
Vendored
+1
View File
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,java_websocket,\
external/java_websocket/patches/0001-cid-1545227-Dm-Dubious-method-used.patch \
external/java_websocket/patches/0001-cid-1545515-Dm-Dubious-method-used.patch \
external/java_websocket/patches/0001-cid-1546264-Dm-Dubious-method-used.patch \
external/java_websocket/patches/0001-cid-1546341-Resource-leak-on-an-exceptional-path.patch \
))
# vim: set noet sw=4 ts=4:
external/java_websocket/patches/0001-cid-1546341-Resource-leak-on-an-exceptional-path.patch
Vendored
+40
View File
@@ -0,0 +1,40 @@
From 77aac6a0be7a22dc63fd449a8292ff0b83dcb005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Tue, 3 Oct 2023 11:06:35 +0100
Subject: [PATCH] cid#1546341 Resource leak on an exceptional path
---
.../java_websocket/server/WebSocketServer.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
index bb8178c..36e19a7 100644
--- a/src/main/java/org/java_websocket/server/WebSocketServer.java
+++ b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -473,10 +473,19 @@ public abstract class WebSocketServer extends AbstractWebSocket implements Runna
if (channel == null) {
return;
}
- channel.configureBlocking(false);
- Socket socket = channel.socket();
- socket.setTcpNoDelay(isTcpNoDelay());
- socket.setKeepAlive(true);
+ try {
+ channel.configureBlocking(false);
+ Socket socket = channel.socket();
+ socket.setTcpNoDelay(isTcpNoDelay());
+ socket.setKeepAlive(true);
+ } catch (IOException ex) {
+ try {
+ channel.close();
+ } catch (IOException e) {
+ // there is nothing that must be done here
+ }
+ throw ex;
+ }
WebSocketImpl w = wsf.createWebSocket(this, drafts);
w.setSelectionKey(channel.register(selector, SelectionKey.OP_READ, w));
try {
--
2.41.0