ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in m_silence when provided with a bad pattern (bug #79)

Browse Source
This commit is contained in:
Daniel De Graaf 2010-09-04 16:36:17 -04:00
parent 33f4713fbd
commit 3ee7abb7b9
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/m_silence.cpp
View File

@ -135,6 +135,12 @@ class CommandSilence : public Command
pattern = CompilePattern(parameters[1].c_str());
}
if (pattern == 0)
{
user->WriteServ("NOTICE %s :Bad SILENCE pattern",user->nick.c_str());
return CMD_INVALID;
}
if (!mask.length())
{
// 'SILENCE +' or 'SILENCE -', assume *!*@*
@ -247,21 +253,24 @@ class CommandSilence : public Command
std::string DecompPattern (const int pattern)
{
std::string out;
if ((pattern & SILENCE_PRIVATE) > 0)
if (pattern & SILENCE_PRIVATE)
out += ",privatemessages";
if ((pattern & SILENCE_CHANNEL) > 0)
if (pattern & SILENCE_CHANNEL)
out += ",channelmessages";
if ((pattern & SILENCE_INVITE) > 0)
if (pattern & SILENCE_INVITE)
out += ",invites";
if ((pattern & SILENCE_NOTICE) > 0)
if (pattern & SILENCE_NOTICE)
out += ",privatenotices";
if ((pattern & SILENCE_CNOTICE) > 0)
if (pattern & SILENCE_CNOTICE)
out += ",channelnotices";
if ((pattern & SILENCE_ALL) > 0)
if (pattern & SILENCE_ALL)
out = ",all";
if ((pattern & SILENCE_EXCLUDE) > 0)
if (pattern & SILENCE_EXCLUDE)
out += ",exclude";
return "<" + out.substr(1) + ">";
if (out.length())
return "<" + out.substr(1) + ">";
else
return "<none>";
}
};