[Libreoffice-commits] core.git: jurt/com

[Caolán McNamara (via logerrit)]

 jurt/com/sun/star/lib/connections/socket/socketConnector.java |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 28da9177229a1d8b6d4a3ba3d84dea2166caae8d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 13:48:59 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Nov 17 18:12:41 2019 +0100

    cid#1448367 Explicit null dereferenced
    
    Change-Id: I1762ad30ba03ee1d06f85023a42646131a7ccde9
    Reviewed-on: https://gerrit.libreoffice.org/83018
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
index 68fdf00c1149..484ffd135e92 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
@@ -143,6 +143,10 @@ public final class socketConnector implements XConnector {
                     throw new NoConnectException(e);
             }
         }
+
+        if (socket == null)
+            throw new ConnectionSetupException("no socket");
+
         XConnection con;
         try {
             // we enable tcpNoDelay for loopback connections because