Changeset 852 for branches

Timestamp:

06/21/10 17:41:30 (20 months ago)

Author:

elly

Message:

Fix hostcrypt memory corruption bug.

File:

• branches/ithildin-1.1/modules/ircd/addons/hostcrypt.c (modified) (6 diffs)

branches/ithildin-1.1/modules/ircd/addons/hostcrypt.c

@@ -220 +220 @@
 
     if (from->client != NULL)
-        sm.len = sprintf(buf, ":%s!%s@%s %s %s%s", from->client->nick,
+        sm.len = snprintf(buf, sizeof(buf), ":%s!%s@%s %s %s%s", from->client->nick,
                 from->client->user, from->client->orighost, cmd,
                 (to != NULL ? to : ""), (to != NULL ? " " : ""));
     else if (from->server != NULL)
-        sm.len = sprintf(buf, ":%s %s %s%s", from->server->name, cmd, 
+        sm.len = snprintf(buf, sizeof(buf), ":%s %s %s%s", from->server->name, cmd, 
                 (to != NULL ? to : ""), (to != NULL ? " " : ""));
     else
-        sm.len = sprintf(buf, "%s %s%s", cmd,
+        sm.len = snprintf(buf, sizeof(buf), "%s %s%s", cmd,
                 (to != NULL ? to : ""), (to != NULL ? " " : ""));
     if (msg != NULL)
@@ -326 +326 @@
         /* this is the easy case.. */
         if ((s = strchr(cli->orighost, '.')) != NULL)
-            sprintf(buf, "%s%u%s%s", hostcrypt.prefix, hash, s,
+            snprintf(buf, sizeof(buf), "%s%u%s%s", hostcrypt.prefix, hash, s,
                     hostcrypt.suffix);
         else
-            sprintf(buf, "%s%u.%s%s", hostcrypt.prefix, hash, cli->orighost,
+            snprintf(buf, sizeof(buf), "%s%u.%s%s", hostcrypt.prefix, hash, cli->orighost,
                     hostcrypt.suffix);
 
@@ -345 +345 @@
         memset(s + 8, 0, 8); /* blech. ;) */
         inet_ntop(PF_INET6, &i6a, buf, HOSTLEN + 1);
-        sprintf(buf + strlen(buf), "%u", hash);
+        snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%u", hash);
 
         return buf;
@@ -360 +360 @@
     phash = (austhex_hash(quads[0]) + austhex_hash(quads[1]) +
             austhex_hash(quads[2])) % AUSTHEX_HASH_SMALL;
-    sprintf(buf, "%s.%s.%u.%u", quads[0], quads[1], phash, hash);
+    snprintf(buf, sizeof(buf), "%s.%s.%u.%u", quads[0], quads[1], phash, hash);
 
     return buf;
@@ -422 +422 @@
         if (s == NULL)
             /* singleton string like 'localhost' */
-            sprintf(buf, "%32s.%s", md5buf, cli->orighost);
+            snprintf(buf, sizeof(buf), "%32s.%s", md5buf, cli->orighost);
         else {
             while (*s != '.' && s > cli->orighost)
@@ -428 +428 @@
             if (s == cli->orighost)
                 /* host is in pure domain.tld form */
-                sprintf(buf, "%32s.%s", md5buf, cli->orighost);
+                snprintf(buf, sizeof(buf), "%32s.%s", md5buf, cli->orighost);
             else
                 /* s is the second to last . in the string now */
-                sprintf(buf, "%s", s + 1);
+                snprintf(buf, sizeof(buf), "%s", s + 1);
         }
         /* buf now contains the host we wish to md5 on */