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

cvs at eggheads.org cvs at eggheads.org
Fri Apr 1 06:22:26 CST 2011


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2011-04-01 12:22:26 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     doc/Changes1.6 src/patch.h src/mod/channels.mod/udefchan.c

Log message:

Fixed getudef() to return intptr_t instead of int to prevent crashes on 64-bit systems.
Backport of the 1.8 patch.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.98 eggdrop1.6/doc/Changes1.6:1.99
--- eggdrop1.6/doc/Changes1.6:1.98	Fri Apr  1 06:10:08 2011
+++ eggdrop1.6/doc/Changes1.6	Fri Apr  1 06:22:15 2011
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.98 2011/04/01 12:10:08 pseudo Exp $
+$Id: Changes1.6,v 1.99 2011/04/01 12:22:15 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,10 @@
 
 1.6.21 (CVS):
 
+  - Fixed getudef() to return intptr_t instead of int to prevent crashes on
+    64-bit systems.
+    Found by: izy` / Patch by: pseudo
+
   - Fixed dns.mod on QNX6/Mac OS X/Solaris
   - Rewrote dns.mod's autoconf checks to detect the resolver library properly
     on Darwin/Solaris.
Index: eggdrop1.6/src/mod/channels.mod/udefchan.c
diff -u eggdrop1.6/src/mod/channels.mod/udefchan.c:1.17 eggdrop1.6/src/mod/channels.mod/udefchan.c:1.18
--- eggdrop1.6/src/mod/channels.mod/udefchan.c:1.17	Sun Feb 13 08:19:33 2011
+++ eggdrop1.6/src/mod/channels.mod/udefchan.c	Fri Apr  1 06:22:16 2011
@@ -2,7 +2,7 @@
  * udefchan.c -- part of channels.mod
  *   user definable channel flags/settings
  *
- * $Id: udefchan.c,v 1.17 2011/02/13 14:19:33 simple Exp $
+ * $Id: udefchan.c,v 1.18 2011/04/01 12:22:16 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2011 Eggheads Development Team
@@ -49,7 +49,7 @@
 
 static intptr_t getudef(struct udef_chans *ul, char *name)
 {
-  int val = 0;
+  intptr_t val = 0;
 
   for (; ul; ul = ul->next)
     if (!egg_strcasecmp(ul->chan, name)) {
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1259 eggdrop1.6/src/patch.h:1.1260
--- eggdrop1.6/src/patch.h:1.1259	Fri Apr  1 06:10:08 2011
+++ eggdrop1.6/src/patch.h	Fri Apr  1 06:22:15 2011
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1259 2011/04/01 12:10:08 pseudo Exp $
+ * $Id: patch.h,v 1.1260 2011/04/01 12:22:15 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1301659661");            /* current unixtime */
+patch("1301660528");            /* current unixtime */
 /*
  *
  *
  */
-patch("dnsautoconf");
+patch("getudef64");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list