Changeset 622 for trunk

Timestamp:

11/27/05 00:57:03 (6 years ago)

Author:

wd

Message:

Fix a couple of valgrind-detected errors.

Location:

trunk/modules/ircd

Files:

• addons/core.c (modified) (1 diff)
• protocols/shared/rfc1459_io.c (modified) (1 diff)

trunk/modules/ircd/addons/core.c

@@ -648 +648 @@
         return CHANMODE_FAIL;
     }
-    strcpy(arg, cp->nick); /* Maintain exact case of nickname */
+    if (arg != cp->nick)
+        strcpy(arg, cp->nick); /* Maintain exact case of nickname if the arg
+                                  came from somewhere but the client's nick */
 
     clp = find_chan_link(cp, chan);

trunk/modules/ircd/protocols/shared/rfc1459_io.c

@@ -68 +68 @@
             if (s - cp->buf < cp->buflen) {
                 cp->buflen -= s - cp->buf;
-                memcpy(cp->buf, s, cp->buflen);
+                memmove(cp->buf, s, cp->buflen);
                 cp->buf[cp->buflen] = '\0';
             } else {