From f34f37a20c0ca80c03367bf0551d04f019ab330e Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 10 Dec 2015 17:10:49 +0100 Subject: [PATCH] Check for 'null' to avoid NPE in Socks5Proxy Check if serverSocket is null before calling isClosed(), as otherwise the resulting NPE will cause an endless loop. Thanks to Michael Grafl for reporting. Fixes SMACK-707. --- .../org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java index 152922300..370c1c0cf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java @@ -387,7 +387,7 @@ public class Socks5Proxy { try { - if (Socks5Proxy.this.serverSocket.isClosed() + if (Socks5Proxy.this.serverSocket == null || Socks5Proxy.this.serverSocket.isClosed() || Thread.currentThread().isInterrupted()) { return; }