[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Wed May 6 13:18:02 CST 2009


Committer  : cvs
CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2009-05-06 19:18:02 UTC

Modified files:
     doc/Changes1.6 src/patch.h src/mod/server.mod/servmsg.c

Log message:

* Fixed another bug in the CTCP parsing code introduced by the servmsg.c buffer overflow patch in 1.6.19.

Patch by: thommey

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.19 eggdrop1.6/doc/Changes1.6:1.20
--- eggdrop1.6/doc/Changes1.6:1.19	Wed Jan 21 21:12:45 2009
+++ eggdrop1.6/doc/Changes1.6	Wed May  6 13:17:51 2009
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.19 2009/01/22 03:12:45 tothwolf Exp $
+$Id: Changes1.6,v 1.20 2009/05/06 19:17:51 tothwolf Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,10 @@
 
 1.6.20 (CVS):
 
+  - Fixed another bug in the CTCP parsing code introduced by the servmsg.c
+    buffer overflow patch in 1.6.19.
+    Patch by: thommey
+
   - Added scripts/dccwhois.tcl Tcl script. This script enhances the built-in
     dcc '.whois' command to allow all users to '.whois' their own handle.
     Patch by: Tothwolf
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.100 eggdrop1.6/src/mod/server.mod/servmsg.c:1.101
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.100	Sat Nov  1 21:19:57 2008
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Wed May  6 13:17:52 2009
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.100 2008/11/02 03:19:57 tothwolf Exp $
+ * $Id: servmsg.c,v 1.101 2009/05/06 19:17:52 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -496,9 +496,9 @@
       *p = 0;
       strncpyz(ctcpbuf, p1, sizeof(ctcpbuf));
       ctcp = ctcpbuf;
-      /* copy the part after the second : in front of it after
-       * the first :, this is temporary copied to ctcpbuf */
-      strncpy(p1 - 1, p + 1, strlen(ctcpbuf) - 1);
+
+      /* remove the ctcp in msg */
+      memmove(p1 - 1, p + 1, strlen(p + 1) + 1);
 
       if (!ignoring)
         detect_flood(nick, uhost, from,
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1200 eggdrop1.6/src/patch.h:1.1201
--- eggdrop1.6/src/patch.h:1.1200	Mon Jun 30 13:12:27 2008
+++ eggdrop1.6/src/patch.h	Wed May  6 13:17:51 2009
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1200 2008/06/30 19:12:27 tothwolf Exp $
+ * $Id: patch.h,v 1.1201 2009/05/06 19:17:51 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1214853098");            /* current unixtime */
+patch("1241636525");            /* current unixtime */
 /*
  *
  *
  */
-patch("joinfix");
+patch("ctcpfix2");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list