pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-06 17:23:13 +02:00
Code Activity

Fixed CanAdd() to use safe iteration and make SNLine::Check really work

Browse Source 
(cherry picked from commit 1bdadde68a)
This commit is contained in:
Adam
2011-01-09 13:37:12 -05:00
parent ce8a069eb5
commit 07528ea8f2
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/operserv.cpp
+27 -3
View File
@@ -364,9 +364,9 @@ std::pair<int, XLine *> XLineManager::CanAdd(const Anope::string &mask, time_t e
ret.first = 0;
ret.second = NULL;
for (unsigned i = 0, end = this->GetCount(); i < end; ++i)
for (unsigned i = this->GetCount(); i > 0; --i)
{
XLine *x = this->GetEntry(i);
XLine *x = this->GetEntry(i - 1);
ret.second = x;
if (x->Mask.equals_ci(mask))
@@ -392,7 +392,6 @@ std::pair<int, XLine *> XLineManager::CanAdd(const Anope::string &mask, time_t e
else if (Anope::Match(x->Mask, mask) && (!expires || x->Expires <= expires))
{
this->DelXLine(x);
--i;
}
}
@@ -636,6 +635,31 @@ void SNLineManager::Send(XLine *x)
ircdproto->SendSGLine(x);
}
XLine *SNLineManager::Check(User *u)
{
for (unsigned i = this->XLines.size(); i > 0; --i)
{
XLine *x = this->XLines[i - 1];
if (x->Expires && x->Expires < Anope::CurTime)
{
this->OnExpire(x);
this->Del(x);
delete x;
this->XLines.erase(XLines.begin() + i - 1);
continue;
}
if (Anope::Match(u->realname, x->Mask))
{
this->OnMatch(u, x);
return x;
}
}
return NULL;
}
XLine *SQLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason)
{
if (mask.find_first_not_of("*") == Anope::string::npos)