Add sane limiting to mode output, so we cant have more than 100 mode chars in the...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5182 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/mode.cpp b/src/mode.cpp
index 290933ab64bd9566f47d9321ac00cf9a14c473c2..1b2ea344253f712b53bce94987728d6f0206fc96 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -351,6 +351,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                bool adding = true, state_change = false;
                unsigned char handler_id = 0;
                int parameter_counter = 2; /* Index of first parameter */
+               int parameter_count = 0;
 
                /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
                if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-'))
@@ -464,6 +465,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                                                if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != ""))
                                                                {
                                                                        parameter_list << " " << parameter;
+                                                                       parameter_count++;
                                                                        /* Does this mode have a prefix? */
                                                                        if (modehandlers[handler_id]->GetPrefix() && targetchannel)
                                                                        {
@@ -480,6 +482,14 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 
                                                                /* Reset the state change flag */
                                                                state_change = false;
+
+                                                               if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100)
+                                                                               || (parameter_count > MAXMODES))
+                                                               {
+                                                                       /* We cant have a mode sequence this long */
+                                                                       letter = mode_sequence.end();
+                                                                       continue;
+                                                               }
                                                        }
                                                }
                                        }