From 2bf4850271230723a9a90c58eaaa58421ad21ce3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 31 Jul 2013 10:44:39 -0500
Subject: Backport d26745b6078e9248f48d299e0b3d5d031c7be3fa do not access NULL
 ICE objects (kde#195034)

---
 ksmserver/server.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ksmserver')

diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 3adcbbade..e69ebbbe9 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -801,6 +801,9 @@ void KSMServer::newConnection( int /*socket*/ )
 {
     IceAcceptStatus status;
     IceConn iceConn = IceAcceptConnection( ((KSMListener*)sender())->listenObj, &status);
+    if (iceConn == NULL) {
+        return;
+    }
     IceSetShutdownNegotiation( iceConn, False );
     IceConnectStatus cstatus;
     while ((cstatus = IceConnectionStatus (iceConn))==IceConnectPending) {
@@ -813,6 +816,7 @@ void KSMServer::newConnection( int /*socket*/ )
         else
             kdDebug( 1218 ) << "ICE Connection rejected!" << endl;
         (void )IceCloseConnection (iceConn);
+        return;
     }
 }
 
-- 
cgit v1.2.1