callerid: actually the guard should be for source_p

[solanum.git] / extensions / ip_cloaking_3.0.c

diff --git a/extensions/ip_cloaking_3.0.c b/extensions/ip_cloaking_3.0.c
index d79af222e1675d94ff990bb168a90423e764b158..2b6f2dcbb371abf27563a92909629168d3bf138d 100644 (file)
--- a/extensions/ip_cloaking_3.0.c
+++ b/extensions/ip_cloaking_3.0.c
@@ -10,6 +10,8 @@
 #include "s_serv.h"
 #include "numeric.h"
 
+static const char ip_cloaking_desc[] = "The old IP cloaking mechanism version 3.0";
+
 /* if you're modifying this module, you'll probably want to change this */
 #define KEY 0x13748cfa
 
@@ -39,8 +41,6 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
        { NULL, NULL }
 };
 
-static const char ip_cloaking_desc[] = "The old IP cloaking mechanism version 3.0";
-
 DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
        ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
 
@@ -103,7 +103,7 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 {
        char *tptr;
        unsigned int accum = get_string_weighted_entropy(inbuf);
-       char buf[HOSTLEN];
+       char buf[HOSTLEN + 1] = { 0 };
        int ipv6 = 0;
 
        strncpy(buf, inbuf, HOSTLEN);
@@ -125,11 +125,11 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 
        if(ipv6)
        {
-           snprintf(outbuf, HOSTLEN, "%s:%x", buf, accum);
+           snprintf(outbuf, HOSTLEN, "%.60s:%x", buf, accum);
        }
        else
        {
-           snprintf(outbuf, HOSTLEN, "%s.%x", buf, accum);
+           snprintf(outbuf, HOSTLEN, "%.60s.%x", buf, accum);
        }
 }
 
@@ -216,7 +216,7 @@ check_new_user(void *vdata)
                source_p->umodes &= ~user_modes['h'];
                return;
        }
-       source_p->localClient->mangledhost = rb_malloc(HOSTLEN);
+       source_p->localClient->mangledhost = rb_malloc(HOSTLEN + 1);
        if (!irccmp(source_p->orighost, source_p->sockhost))
                do_host_cloak_ip(source_p->orighost, source_p->localClient->mangledhost);
        else