Save ourselves 3 dereferences

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index e7ee1c3dc44268cd5eaf5bfa36ca439b1e7e805d..5df98d23b0dae380e0d8b93199ffa47b00ee6aae 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -423,12 +423,14 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                int handler_id = 0;
                int parameter_counter = 2; /* Index of first parameter */
 
-               for (std::string::const_iterator modeletter = mode_sequence.begin(); modeletter != mode_sequence.end(); modeletter++)
+               for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
                {
-                       switch (*modeletter)
+                       unsigned char modechar = *letter;
+
+                       switch (modechar)
                        {
 
-                               log(DEBUG,"Iterate mode letter %c",*modeletter);
+                               log(DEBUG,"Iterate mode letter %c",modechar);
 
                                /* NB:
                                 * For + and - mode characters, we don't just stick the character into the output sequence.
@@ -463,13 +465,13 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                         * a user mode. This is a little stranger, but a lot
                                         * faster, than using a map of pairs.
                                         */
-                                       handler_id = (*modeletter - 65) | mask;
+                                       handler_id = (modechar - 65) | mask;
 
                                        if (modehandlers[handler_id])
                                        {
                                                bool abort = false;
 
-                                               log(DEBUG,"Found a ModeHandler* for mode %c",*modeletter);
+                                               log(DEBUG,"Found a ModeHandler* for mode %c",modechar);
 
                                                for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
                                                {
@@ -496,6 +498,16 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                                                }
                                                        }
                                                        ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
+
+                                                       if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == ""))
+                                                       {
+                                                               /* The handler nuked the parameter and they are supposed to have one.
+                                                                * We CANT continue now, even if they actually returned MODEACTION_ALLOW,
+                                                                * so we bail to the next mode character.
+                                                                */
+                                                               continue;
+                                                       }
+
                                                        if (ma == MODEACTION_ALLOW)
                                                        {
                                                                log(DEBUG,"ModeAction was allow");
@@ -508,7 +520,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                                                }
                                                                
                                                                /* Add the mode letter */
-                                                               output_sequence = output_sequence + *modeletter;
+                                                               output_sequence.push_back(modechar);
                                                                log(DEBUG,"Added mode letter to output sequence, sequence now: '%s'",output_sequence.c_str());
 
                                                                /* Is there a valid parameter for this mode? If so add it to the parameter list */
@@ -598,16 +610,6 @@ void ModeParser::CleanMask(std::string &mask)
                /* Has a ! but no @, it must be a nick!ident */
                mask.append("@*");
        }
-
-       /* Check for dumb stuff like *@*!*
-        * swap the two items over so that at least the n!u@h ordering
-        * is correct even if the elements may not be
-        */
-       if (((pos_of_pling != std::string::npos) && (pos_of_at != std::string::npos)) && (pos_of_pling > pos_of_at))
-       {
-               mask.replace(pos_of_pling, 1, "@");
-               mask.replace(pos_of_at, 1, "!");
-       }
 }
 
 bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)