X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=905cc50b5f611d17273b9dec3ceff4dfca8f0c40;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=c5dc35fe371b52fc1881a6686716b3fdc2c52772;hpb=44489ddf7e90413d8f656aea24d74445bab227af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index c5dc35fe3..905cc50b5 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -60,10 +60,15 @@ class ModuleBlockColor : public Module
 			bool modeset = c->IsModeSet(bc);
 			if (!c->GetExtBanStatus(user, 'c').check(!modeset))
 			{
-				for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
+				std::string ctcpname; // Unused.
+				std::string message;
+				if (!details.IsCTCP(ctcpname, message))
+					message.assign(details.text);
+
+				for (std::string::iterator i = message.begin(); i != message.end(); ++i)
 				{
-					// Block all control codes except \001 for CTCP
-					if ((*i >= 0) && (*i < 32) && (*i != 1))
+					const unsigned char chr = static_cast<unsigned char>(*i);
+					if (chr < 32)
 					{
 						if (modeset)
 							user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", &bc));