Fix crash on suspend etc if kicking a user causes the service bot to part when the service bot is next in the userlist (as we have an iterator to it)

1 files changed, 9 insertions, 5 deletions

diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index ea7f7840d..9261bcddd 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -594,15 +594,19 @@ class CommandOSSQLine : public CommandOSSXLineBase
 
 					if (!Anope::Match(c->name, mask, false, true))
 						continue;
-					for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; )
+
+					std::vector<User *> users;
+					for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
 					{
 						UserContainer *uc = *it;
-						++it;
+						User *user = uc->user;
 
-						if (uc->user->HasMode(UMODE_OPER) || uc->user->server == Me)
-							continue;
-						c->Kick(NULL, uc->user, "%s", reason.c_str());
+						if (!user->HasMode(UMODE_OPER) && user->server != Me)
+							users.push_back(user);
 					}
+
+					for (unsigned i = 0; i < users.size(); ++i)
+						c->Kick(NULL, users[i], "%s", reason.c_str());
 				}
 			}
 			else