X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=9d17f5be8b8eda5cae8a329fd550ef2d3d6d6b08;hb=8f5952d1e56c9dbefebbacfc7e40546a9df901e8;hp=e2129b55a46ce03a9466d169b2bed3886c5d082b;hpb=98372c3cf2c1455e41c388d822876a4d146ae76d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index e2129b55a..9d17f5be8 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -89,6 +89,11 @@ void ModeHandler::DisplayEmptyList(User*, Channel*)
 
 void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
+	const std::string message = InspIRCd::Format("You must specify a parameter for the %s mode", name.c_str());
+	if (channel)
+		user->WriteNumeric(Numerics::InvalidModeParameter(channel, this, "*", message));
+	else
+		user->WriteNumeric(Numerics::InvalidModeParameter(dest, this, "*", message));
 }
 
 bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*)
@@ -449,6 +454,12 @@ unsigned int ModeParser::ProcessSingle(User* user, Channel* targetchannel, User*
 		Modes::Change& item = *i;
 		ModeHandler* mh = item.mh;
 
+		// If a mode change has been given for a mode that does not exist then reject
+		// it. This can happen when core_reloadmodule attempts to restore a mode that
+		// no longer exists.
+		if (!mh)
+			continue;
+
 		// If the mode is supposed to have a parameter then we first take a look at item.param
 		// and, if we were asked to, also handle mode merges now
 		if (mh->NeedsParam(item.adding))