Fix use-after-free on Lists_CheckReason()

[ngircd-alex.git] / src / ngircd / irc-macros.h

diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h
index bd63ec495f7253f8b20dd9a006e794b1158d7626..f0c0f36ec6e32c8c4aa3195d031e7a9082d04dd6 100644 (file)
--- a/src/ngircd/irc-macros.h
+++ b/src/ngircd/irc-macros.h
@@ -17,6 +17,17 @@
  * Macros for functions that handle IRC commands.
  */
 
+/**
+ * Make sure that number of passed parameters is equal to Count.
+ *
+ * If there are not exactly Count parameters, send an error to the client and
+ * return from the function.
+ */
+#define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \
+if (Req->argc != Count) \
+       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command);
+
 /**
  * Make sure that number of passed parameters is less or equal than Max.
  *
@@ -39,6 +50,17 @@ if (Req->argc < Min) \
        return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
                                  Client_ID(Client), Req->command);
 
+/**
+ * Make sure that number of passed parameters is in between Min and Max.
+ *
+ * If there aren't at least Min parameters or if there are more than Max
+ * parameters, send an error to the client and return from the function.
+ */
+#define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \
+if (Req->argc < Min || Req->argc > Max) \
+       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+                                 Client_ID(Client), Req->command);
+
 /**
  * Get sender of an IRC command.
  *