Merge pull request #275 from edk0/override-immunity

[solanum.git] / modules / m_alias.c

diff --git a/modules/m_alias.c b/modules/m_alias.c
index 7f107219a67a1bbb4f49395b8c356f4016fb67ab..fdc2a8f1240676f52d5f404e3ad36b1c1a249924 100644 (file)
--- a/modules/m_alias.c
+++ b/modules/m_alias.c
@@ -31,6 +31,7 @@
 #include "numeric.h"
 #include "send.h"
 #include "packet.h"
+#include "s_assert.h"
 
 static const char alias_desc[] = "Provides the system for services aliases";
 
@@ -56,13 +57,16 @@ create_aliases(void)
        rb_dictionary_iter iter;
        struct alias_entry *alias;
 
-       s_assert(rb_dlink_list_length(alias_messages) > 0);
+       s_assert(rb_dlink_list_length(&alias_messages) == 0);
 
        RB_DICTIONARY_FOREACH(alias, &iter, alias_dict)
        {
-               struct Message *message = rb_malloc(sizeof(struct Message));
+               struct Message *message = rb_malloc(sizeof(*message) + strlen(alias->name) + 1);
+               char *cmd = (char*)message + sizeof(*message);
 
-               message->cmd = alias->name;
+               /* copy the alias name as it will be freed early on a rehash */
+               strcpy(cmd, alias->name);
+               message->cmd = cmd;
                memcpy(message->handlers, alias_msgtab, sizeof(alias_msgtab));
 
                mod_add_cmd(message);
@@ -110,7 +114,7 @@ m_alias(struct MsgBuf *msgbuf, struct Client *client_p, struct Client *source_p,
 {
        struct Client *target_p;
        struct alias_entry *aptr = rb_dictionary_retrieve(alias_dict, msgbuf->cmd);
-       char *p;
+       char *p, *str;
 
        if(aptr == NULL)
        {
@@ -121,14 +125,6 @@ m_alias(struct MsgBuf *msgbuf, struct Client *client_p, struct Client *source_p,
 
                return;
        }
-       else if(parc < 2)
-       {
-               sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
-                          me.name,
-                          EmptyString(client_p->name) ? "*" : client_p->name,
-                          msgbuf->cmd);
-               return;
-       }
 
        if(!IsFloodDone(client_p) && client_p->localClient->receiveM > 20)
                flood_endgrace(client_p);
@@ -155,17 +151,15 @@ m_alias(struct MsgBuf *msgbuf, struct Client *client_p, struct Client *source_p,
                return;
        }
 
-       if(EmptyString(parv[1]))
+       str = reconstruct_parv(parc - 1, &parv[1]);
+       if(EmptyString(str))
        {
                sendto_one(client_p, form_str(ERR_NOTEXTTOSEND), me.name, target_p->name);
                return;
        }
 
-       /* increment the hitcounter on this alias */
-       aptr->hits++;
-
        sendto_one(target_p, ":%s PRIVMSG %s :%s",
                        get_id(client_p, target_p),
                        p != NULL ? aptr->target : get_id(target_p, target_p),
-                       parv[1]);
+                       str);
 }