Backport d26745b6078e9248f48d299e0b3d5d031c7be3fa

do not access NULL ICE objects (kde#195034)
11 years ago · 2bf4850271
parent 4d8f3a663f
commit 2bf4850271
1 changed files with 4 additions and 0 deletions
--- 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;
    }
 }