]> granicus.if.org Git - icinga2/commitdiff
Fix crash on Windows
authorGunnar Beutner <gunnar.beutner@netways.de>
Tue, 12 Jul 2016 13:33:05 +0000 (15:33 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Tue, 12 Jul 2016 13:33:44 +0000 (15:33 +0200)
fixes #11730

lib/base/socketevents-poll.cpp

index 784212a16ce27790df67c2dccfc07c9cfc7e5452..3532f5658de88c34c59b47697c7a558035291bfe 100644 (file)
@@ -55,6 +55,9 @@ void SocketEventEnginePoll::ThreadProc(int tid)
                                typedef std::map<SOCKET, SocketEventDescriptor>::value_type kv_pair;
 
                                BOOST_FOREACH(const kv_pair& desc, m_Sockets[tid]) {
+                                       if (desc.second.Events == 0)
+                                               continue;
+
                                        if (desc.second.EventInterface)
                                                desc.second.EventInterface->m_EnginePrivate = &pfds[i];
 
@@ -65,6 +68,8 @@ void SocketEventEnginePoll::ThreadProc(int tid)
                                        i++;
                                }
 
+                               pfds.resize(i);
+
                                m_FDChanged[tid] = false;
                                m_CV[tid].notify_all();
                        }