From: pk910 <philipp@zoelle1.de>
Date: Tue, 27 Aug 2013 20:21:03 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.pk910.de:16110/srvx
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=6cef75f8e38e985b1a8afdabb5d0c79ef3514002;hp=ab0bd865cd350a4c607a7e9a49a7ae102cf8d744

Merge branch 'master' of ssh://git.pk910.de:16110/srvx
---

diff --git a/src/modcmd.c b/src/modcmd.c
index a8e123a..25a3fd3 100644
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -721,10 +721,14 @@ 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];
+        char *old_argv[MAXNUMPARAMS];
         int res;
+        unsigned int nn;
+
+        for(nn=0;nn<argc;nn++)
+            old_argv[nn] = argv[nn];
 
-        res = svccmd_expand_alias(cmd, argc, argv, new_argv);
+        res = svccmd_expand_alias(cmd, argc, old_argv, argv);
         if (res < 0) {
             send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name);
             return 0;
@@ -733,7 +737,6 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo
             return 0;
         }
         argc = res;
-        argv = new_argv;
 
         /* Try again to grab a handle to the channel after alias
          * expansion, overwriting any previous channel. This should,