Use safe iter for deleting while iterating

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6024 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 945125c75d33b49068fd81578ff76f98bafafec7..8c81427e910290dd7b9ea5af61cca9dd8b961d05 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -242,33 +242,22 @@ class ModuleSVSHold : public Module
 
        void ExpireBans()
        {
-               bool go_again = true;
-
-               while (go_again)
+               SVSHoldlist::iterator iter,safeiter;
+               for (iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++)
                {
-                       go_again = false;
-       
-                       for (SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++)
+                       /* 0 == permanent, don't mess with them! -- w00t */
+                       if ((*iter)->length != 0)
                        {
-                               /* 0 == permanent, don't mess with them! -- w00t */
-                               if ((*iter)->length != 0)
+                               if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time())
                                {
-                                       if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time())
-                                       {
-                                               ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
-                                               ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
-                                               HoldMap.erase(assign((*iter)->nickname));
-
-                                               delete *iter;
-
-                                               SVSHolds.erase(iter);
-
-                                               go_again = true;
-                                       }
+                                       ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
+                                       ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
+                                       HoldMap.erase(assign((*iter)->nickname));
+                                       delete *iter;
+                                       safeiter = iter;
+                                       --iter;
+                                       SVSHolds.erase(safeiter);
                                }
-       
-                               if (go_again == true)
-                                       break;
                        }
                }
        }