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

cvs at eggheads.org cvs at eggheads.org
Thu Nov 4 11:54:19 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-11-04 17:54:17 UTC
Committer  : Thomas Sader <thommey at gmail.com>

Modified files:
     doc/Changes1.8 src/chanprog.c src/patch.h

Log message:

Fixed a bug in (u)timers which could lead to invalid memory access.

---------------------- diff included ----------------------
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.34 eggdrop1.8/doc/Changes1.8:1.35
--- eggdrop1.8/doc/Changes1.8:1.34	Mon Nov  1 16:38:33 2010
+++ eggdrop1.8/doc/Changes1.8	Thu Nov  4 11:53:55 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.34 2010/11/01 22:38:33 pseudo Exp $
+$Id: Changes1.8,v 1.35 2010/11/04 17:53:55 thommey Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,9 @@
 
 1.8.0 (CVS):
 
+  - Fixed a bug in (u)timers which could lead to invalid memory access.
+    Found by: dr1 / Patch by: thommey
+
   - Made it possible to specify ssl independently for telnet and user ports
     when modifying bot addresses.
   - Changed the syntax of .chaddr and .+bot to use space as a port separator
Index: eggdrop1.8/src/chanprog.c
diff -u eggdrop1.8/src/chanprog.c:1.6 eggdrop1.8/src/chanprog.c:1.7
--- eggdrop1.8/src/chanprog.c:1.6	Wed Oct 27 14:47:26 2010
+++ eggdrop1.8/src/chanprog.c	Thu Nov  4 11:54:04 2010
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.6 2010/10/27 20:47:26 pseudo Exp $
+ * $Id: chanprog.c,v 1.7 2010/11/04 17:54:04 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -686,7 +686,7 @@
     argv[1] = mark->cmd;
     argv[2] = id;
     argv[3] = count;
-    x = Tcl_Merge(sizeof *argv, argv);
+    x = Tcl_Merge(sizeof(argv)/sizeof(*argv), argv);
     Tcl_AppendElement(irp, x);
     Tcl_Free((char *) x);
   }
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.23 eggdrop1.8/src/patch.h:1.24
--- eggdrop1.8/src/patch.h:1.23	Mon Nov  1 16:38:34 2010
+++ eggdrop1.8/src/patch.h	Thu Nov  4 11:54:05 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.23 2010/11/01 22:38:34 pseudo Exp $
+ * $Id: patch.h,v 1.24 2010/11/04 17:54:05 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -46,7 +46,7 @@
  *
  *
  */
-patch("v6syntax");
+patch("timerscount");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list