Fix invalid iterator use when removing modes in ModuleManager::DoSafeUnload()

diff --git a/src/modules.cpp b/src/modules.cpp
index b6d18b8fd79b2502b82cad3abdc81e36ae1e321c..a4b5ae4bc37653dbfdd04a869187adc08550c817 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -413,17 +413,19 @@ void ModuleManager::DoSafeUnload(Module* mod)
        }
 
        const ModeParser::ModeHandlerMap& usermodes = ServerInstance->Modes->GetModes(MODETYPE_USER);
-       for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); ++i)
+       for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); )
        {
                ModeHandler* mh = i->second;
+               ++i;
                if (mh->creator == mod)
                        this->DelService(*mh);
        }
 
        const ModeParser::ModeHandlerMap& chanmodes = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
-       for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); ++i)
+       for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); )
        {
                ModeHandler* mh = i->second;
+               ++i;
                if (mh->creator == mod)
                        this->DelService(*mh);
        }