From 8ec115aecc28462e51860b8ceec68a92c5650f52 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sun, 15 Mar 2009 19:00:29 +0100 Subject: [PATCH] Upstream tarball 9511 --- .svn-revision | 2 +- src/ExternalConn.cpp | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.svn-revision b/.svn-revision index c2122e8c..64bc245f 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9509 +9511 diff --git a/src/ExternalConn.cpp b/src/ExternalConn.cpp index b41d7b02..c73b46c5 100644 --- a/src/ExternalConn.cpp +++ b/src/ExternalConn.cpp @@ -1787,13 +1787,16 @@ void ECNotifier::Add_EC_Client(CECServerSocket *sock) void ECNotifier::Remove_EC_Client(CECServerSocket *sock) { - ECUpdateMsgSource **notifier_array = m_msg_source[sock]; - m_msg_source.erase(sock); - - for(int i = 0; i < EC_STATUS_LAST_PRIO; i++) { - delete notifier_array[i]; + if (m_msg_source.count(sock)) { + ECUpdateMsgSource **notifier_array = m_msg_source[sock]; + + m_msg_source.erase(sock); + + for(int i = 0; i < EC_STATUS_LAST_PRIO; i++) { + delete notifier_array[i]; + } + delete [] notifier_array; } - delete [] notifier_array; } void ECNotifier::NextPacketToSocket() -- 2.11.4.GIT