[cvslog] (2002-09-10 02:22:11 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Mon Sep 9 21:23:01 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-09-10 02:22:11 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/eggdrop.h src/patch.h
     src/mod/transfer.mod/transfer.c

Log message:

Fixed a possible buffer overflow in raw_dcc_resend_send().

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.404 eggdrop1.6/doc/UPDATES1.6:1.405
--- eggdrop1.6/doc/UPDATES1.6:1.404	Mon Sep  9 18:14:23 2002
+++ eggdrop1.6/doc/UPDATES1.6	Mon Sep  9 21:22:00 2002
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.404 2002/09/09 23:14:23 wcc Exp $
+$Id: UPDATES1.6,v 1.405 2002/09/10 02:22:00 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.13
 Found by  Fixed by  What...
+Jerome    Wcc       fixed a possible buffer overflow in raw_dcc_resend_send()
           darko``   fixed a missing escape in some regexps in misc/modconfig
 [sL]      Wcc       channel set #chan chanmode $var corrupted $var in Tcl8.x
           blaster^  don't log "joined #chan but didn't want to" in certain cases where
Index: eggdrop1.6/src/eggdrop.h
diff -u eggdrop1.6/src/eggdrop.h:1.38 eggdrop1.6/src/eggdrop.h:1.39
--- eggdrop1.6/src/eggdrop.h:1.38	Tue Jan  1 21:46:35 2002
+++ eggdrop1.6/src/eggdrop.h	Mon Sep  9 21:22:01 2002
@@ -4,7 +4,7 @@
  *
  *   IF YOU ALTER THIS FILE, YOU NEED TO RECOMPILE THE BOT.
  *
- * $Id: eggdrop.h,v 1.38 2002/01/02 03:46:35 guppy Exp $
+ * $Id: eggdrop.h,v 1.39 2002/09/10 02:22:01 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -61,7 +61,7 @@
 /* Handy string lengths */
 
 #define UHOSTMAX	160	/* reasonable, i think?			*/
-#define DIRMAX		256	/* paranoia				*/
+#define DIRMAX		512	/* paranoia				*/
 #define LOGLINEMAX	767	/* for misc.c/putlog() <cybah>		*/
 #define BADHANDCHARS	"-,+*=:!.@#;$%&"
 
@@ -301,7 +301,7 @@
 struct xfer_info {
   char *filename;
   char *origname;
-  char dir[121];		/* used when uploads go to the current dir */
+  char dir[DIRLEN];		/* used when uploads go to the current dir */
   unsigned long length;
   unsigned long acked;
   char buf[4];			/* you only need 5 bytes!		   */
Index: eggdrop1.6/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.c:1.52 eggdrop1.6/src/mod/transfer.mod/transfer.c:1.53
--- eggdrop1.6/src/mod/transfer.mod/transfer.c:1.52	Wed Aug 14 23:51:53 2002
+++ eggdrop1.6/src/mod/transfer.mod/transfer.c	Mon Sep  9 21:22:01 2002
@@ -1,7 +1,7 @@
 /*
  * transfer.c -- part of transfer.mod
  *
- * $Id: transfer.c,v 1.52 2002/08/15 04:51:53 wcc Exp $
+ * $Id: transfer.c,v 1.53 2002/09/10 02:22:01 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1483,8 +1483,8 @@
     nfn = buf = replace_spaces(nfn);
   dcc[i].u.xfer->origname = get_data_ptr(strlen(nfn) + 1);
   strcpy(dcc[i].u.xfer->origname, nfn);
-  strcpy(dcc[i].u.xfer->from, from);
-  strcpy(dcc[i].u.xfer->dir, dir);
+  strncpyz(dcc[i].u.xfer->from, from, NICKLEN);
+  strncpyz(dcc[i].u.xfer->dir, dir, DIRLEN);
   dcc[i].u.xfer->length = dccfilesize;
   dcc[i].timeval = now;
   dcc[i].u.xfer->f = f;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.817 eggdrop1.6/src/patch.h:1.818
--- eggdrop1.6/src/patch.h:1.817	Mon Sep  9 18:14:23 2002
+++ eggdrop1.6/src/patch.h	Mon Sep  9 21:22:01 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.817 2002/09/09 23:14:23 wcc Exp $
+ * $Id: patch.h,v 1.818 2002/09/10 02:22:01 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1031612795");		/* current unixtime */
+patch("1031624286");		/* current unixtime */
 /*
  *
  *
  */
-patch("modconfig");
+patch("dcc-overflow");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list