external/java_websocket/patches/0001-cid-1546341-Resource-leak-on-an-exceptional-path.patch

   1 From 77aac6a0be7a22dc63fd449a8292ff0b83dcb005 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
   3 Date: Tue, 3 Oct 2023 11:06:35 +0100
   4 Subject: [PATCH] cid#1546341 Resource leak on an exceptional path
   5
   6 ---
   7  .../java_websocket/server/WebSocketServer.java  | 17 +++++++++++++----
   8  1 file changed, 13 insertions(+), 4 deletions(-)
   9
  10 diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
  11 index bb8178c..36e19a7 100644
  12 --- a/src/main/java/org/java_websocket/server/WebSocketServer.java
  13 +++ b/src/main/java/org/java_websocket/server/WebSocketServer.java
  14 @@ -473,10 +473,19 @@ public abstract class WebSocketServer extends AbstractWebSocket implements Runna
  15      if (channel == null) {
  16        return;
  17      }
  18 -    channel.configureBlocking(false);
  19 -    Socket socket = channel.socket();
  20 -    socket.setTcpNoDelay(isTcpNoDelay());
  21 -    socket.setKeepAlive(true);
  22 +    try {
  23 +      channel.configureBlocking(false);
  24 +      Socket socket = channel.socket();
  25 +      socket.setTcpNoDelay(isTcpNoDelay());
  26 +      socket.setKeepAlive(true);
  27 +    } catch (IOException ex) {
  28 +      try {
  29 +        channel.close();
  30 +      } catch (IOException e) {
  31 +        // there is nothing that must be done here
  32 +      }
  33 +      throw ex;
  34 +    }
  35      WebSocketImpl w = wsf.createWebSocket(this, drafts);
  36      w.setSelectionKey(channel.register(selector, SelectionKey.OP_READ, w));
  37      try {
  38 --
  39 2.41.0
  40