summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-07-31 10:44:39 -0500
committerTimothy Pearson <[email protected]>2013-07-31 10:44:39 -0500
commit2bf4850271230723a9a90c58eaaa58421ad21ce3 (patch)
treefb5a8facf3cd789c95b4b8efa59e150508a4f239 /ksmserver
parent4d8f3a663faf631b2976ef920d529c6230132d9e (diff)
downloadtdebase-2bf4850271230723a9a90c58eaaa58421ad21ce3.tar.gz
tdebase-2bf4850271230723a9a90c58eaaa58421ad21ce3.zip
Backport d26745b6078e9248f48d299e0b3d5d031c7be3fa
do not access NULL ICE objects (kde#195034)
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/server.cpp4
1 files changed, 4 insertions, 0 deletions
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;
}
}