Reject setting modes which are null or not registered.

diff --git a/include/users.h b/include/users.h
index 28b370725b4bd2f3af9ac6b155a571c86ad62f8b..ef19adb5d858d059530f21f699d6daa2adb3a9bf 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -932,5 +932,6 @@ inline bool User::IsModeSet(UserModeReference& moderef) const
 
 inline void User::SetMode(ModeHandler* mh, bool value)
 {
-       modes[mh->GetId()] = value;
+       if (mh && mh->GetId() != ModeParser::MODEID_MAX)
+               modes[mh->GetId()] = value;
 }

diff --git a/src/channels.cpp b/src/channels.cpp
index c9816db4b006795fc0dde9faef88ade67a6d07b7..e25500892baa8c8f3942884f183e329fc44e29e1 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -40,7 +40,8 @@ Channel::Channel(const std::string &cname, time_t ts)
 
 void Channel::SetMode(ModeHandler* mh, bool on)
 {
-       modes[mh->GetId()] = on;
+       if (mh && mh->GetId() != ModeParser::MODEID_MAX)
+               modes[mh->GetId()] = on;
 }
 
 void Channel::SetTopic(User* u, const std::string& ntopic, time_t topicts, const std::string* setter)