Merge tag 'v2.0.25' into master.

[user/henk/code/inspircd.git] / src / modes / cmode_l.cpp

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 128854b50e94d19931736d9025ddfdfbbcb3d3dc..d61b2597b40444da2574c176796293ee784c0402 100644 (file)
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -20,9 +20,6 @@
 
 
 #include "inspircd.h"
-#include "mode.h"
-#include "channels.h"
-#include "users.h"
 #include "builtinmodes.h"
 
 ModeChannelLimit::ModeChannelLimit()
@@ -38,7 +35,11 @@ bool ModeChannelLimit::ResolveModeConflict(std::string &their_param, const std::
 
 ModeAction ModeChannelLimit::OnSet(User* user, Channel* chan, std::string& parameter)
 {
-       ext.set(chan, ConvToInt(parameter));
+       int limit = ConvToInt(parameter);
+       if (limit < 0)
+               return MODEACTION_DENY;
+
+       ext.set(chan, limit);
        return MODEACTION_ALLOW;
 }