From 594b9e031c9d9c209ab8d2475255442c6eb7a343 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Wed, 5 Feb 2014 17:51:03 +0100
Subject: Fix oversight in 3752b3f59d5216d7dc6221a361efc76b9ad2273d

---
 src/socketengines/socketengine_epoll.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/socketengines/socketengine_epoll.cpp')

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index af58cb026..b9563ed2b 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -54,6 +54,7 @@ public:
 
 EPollEngine::EPollEngine() : events(1)
 {
+	CurrentSetSize = 0;
 	int max = ulimit(4, 0);
 	if (max > 0)
 	{
@@ -193,7 +194,8 @@ int EPollEngine::DispatchEvents()
 
 	for (int j = 0; j < i; j++)
 	{
-		struct epoll_event& ev = events[j];
+		// Copy these in case the vector gets resized and ev invalidated
+		const epoll_event ev = events[j];
 
 		EventHandler* eh = GetRef(ev.data.fd);
 		if (!eh)
-- 
cgit v1.3.1-10-gc9f91