From: Michael Poole <mdpoole@troilus.org>
Date: Sat, 5 Jul 2008 11:51:06 +0000 (-0400)
Subject: Fix SourceForge bug #864524: Say if too few arguments passed to alias.
X-Git-Tag: v1.4.0-rc3~9
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=b448c437dc53a540124d5e10e257d84a4c9415d2

Fix SourceForge bug #864524: Say if too few arguments passed to alias.

src/modcmd.c (svccmd_expand_alias): If the lower bound is past the end of
     the argument list, return -1.
  (svccmd_invoke_argv): Detect that and report it as needing more params.
---

diff --git a/src/modcmd.c b/src/modcmd.c
index 4fb5a7a..59b730a 100644
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -613,6 +613,8 @@ svccmd_expand_alias(struct svccmd *cmd, unsigned int old_argc, char *old_argv[],
                 log_module(MAIN_LOG, LOG_ERROR, "Alias expansion parse error in %s (near %s; %s.%s arg %d).", arg, end_num, cmd->parent->bot->nick, cmd->name, ii);
                 return 0;
             }
+            if (lbound >= old_argc)
+                return -1;
             if (ubound >= old_argc)
                 ubound = old_argc - 1;
             if (lbound < old_argc)
@@ -695,11 +697,17 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo
     /* Expand the alias arguments, if there are any. */
     if (cmd->alias.used) {
         char *new_argv[MAXNUMPARAMS];
-        argc = svccmd_expand_alias(cmd, argc, argv, new_argv);
-        if (!argc) {
-            send_message(service->bot, user, "MCMSG_ALIAS_ERROR", cmd->name);
+        int res;
+
+        res = svccmd_expand_alias(cmd, argc, argv, new_argv);
+        if (res < 0) {
+            send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name);
+            return 0;
+        } else if (res == 0) {
+            send_message(user, service->bot, "MCMSG_ALIAS_ERROR", cmd->name);
             return 0;
         }
+        argc = res;
         argv = new_argv;
 
         /* Try again to grab a handle to the channel after alias