Fix an iterator invalidation when finding the messageflood counter.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index d22591515..2422c316f 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -86,7 +86,8 @@ public:
 
 	CounterMap::iterator Find(User* who)
 	{
-		CounterMap::iterator ret = counters.end();
+		auto found = false;
+		CounterMap::iterator ret;
 		for (auto it = counters.begin(); it != counters.end(); )
 		{
 			if (it->second.reset <= ServerInstance->Time())
@@ -94,11 +95,14 @@ public:
 			else
 			{
 				if (it->first == who)
+				{
+					found = true;
 					ret = it;
+				}
 				it++;
 			}
 		}
-		return ret;
+		return found ? ret : counters.end();
 	}
 };