From aa885c1661979b43ab26a682e46ab93306ff8015 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 27 Feb 2021 01:30:45 +0000
Subject: Fix not sending ERR_INVALIDMODEPARAM when a parameter is malformed.

Closes #1850.
---
 src/mode.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/mode.cpp')

diff --git a/src/mode.cpp b/src/mode.cpp
index 1c17a6598..d183d0240 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -104,6 +104,14 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 		user->WriteNumeric(Numerics::InvalidModeParameter(dest, this, "*", message));
 }
 
+void ModeHandler::OnParameterInvalid(User* user, Channel* targetchannel, User* targetuser, const std::string& parameter)
+{
+	if (targetchannel)
+		user->WriteNumeric(Numerics::InvalidModeParameter(targetchannel, this, "*"));
+	else
+		user->WriteNumeric(Numerics::InvalidModeParameter(targetuser, this, "*"));
+}
+
 bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*)
 {
 	return (theirs < ours);
@@ -403,7 +411,10 @@ static bool IsModeParamValid(User* user, Channel* targetchannel, User* targetuse
 
 	// The parameter cannot begin with a ':' character or contain a space
 	if ((item.param[0] == ':') || (item.param.find(' ') != std::string::npos))
+	{
+		item.mh->OnParameterInvalid(user, targetchannel, targetuser, item.param);
 		return false;
+	}
 
 	return true;
 }
-- 
cgit v1.3.1-10-gc9f91