Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_links.c

diff --git a/modules/m_links.c b/modules/m_links.c
index 3aafbc7f294dd9f331a5b1a1fda7fd1e3f28ebae..bc28ad8bc17b22f60be453a76ed757a942091ac9 100644 (file)
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -87,6 +87,8 @@ mo_links(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(parc > 2)
        {
+               if(strlen(parv[2]) > HOSTLEN)
+                       return 0;
                if(hunt_server(client_p, source_p, ":%s LINKS %s :%s", 1, parc, parv)
                   != HUNTED_ISME)
                        return 0;
@@ -138,19 +140,21 @@ clean_string(char *dest, const unsigned char *src, size_t len)
        if(dest == NULL || src == NULL)
                return NULL;
 
-       len -= 3;               /* allow for worst case, '^A\0' */
-
-       while (*src && (len > 0))
+       while (*src && (len > 1))
        {
                if(*src & 0x80) /* if high bit is set */
                {
                        *d++ = '.';
                        --len;
+                       if(len <= 1)
+                               break;
                }
                else if(!IsPrint(*src)) /* if NOT printable */
                {
                        *d++ = '^';
                        --len;
+                       if(len <= 1)
+                               break;
                        *d++ = 0x40 + *src;     /* turn it into a printable */
                }
                else