[cvslog] (2003-01-20 08:55:04 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Mon Jan 20 02:56:00 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-01-20 08:55:04 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     src/dccutil.c src/patch.h

Log message:

Fixed a segfault in killtransfer() with non-transfer connections.

---------------------- diff included ----------------------
Index: eggdrop1.6/src/dccutil.c
diff -u eggdrop1.6/src/dccutil.c:1.42 eggdrop1.6/src/dccutil.c:1.43
--- eggdrop1.6/src/dccutil.c:1.42	Fri Jan 17 19:58:05 2003
+++ eggdrop1.6/src/dccutil.c	Mon Jan 20 02:54:54 2003
@@ -6,7 +6,7 @@
  *   memory management for dcc structures
  *   timeout checking for dcc connections
  *
- * $Id: dccutil.c,v 1.42 2003/01/18 01:58:05 wcc Exp $
+ * $Id: dccutil.c,v 1.43 2003/01/20 08:54:54 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -258,7 +258,7 @@
 /* Closes an open FD for transfer sockets. */
 void killtransfer(int n)
 {
-  if (dcc[n].u.xfer->f) {
+  if ((dcc[n].u.xfer->f) && (dcc[n].type->flags & DCT_FILETRAN)) {
     fclose(dcc[n].u.xfer->f);
     dcc[n].u.xfer->f = NULL;
   }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.875 eggdrop1.6/src/patch.h:1.876
--- eggdrop1.6/src/patch.h:1.875	Mon Jan 20 02:51:19 2003
+++ eggdrop1.6/src/patch.h	Mon Jan 20 02:54:54 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.875 2003/01/20 08:51:19 wcc Exp $
+ * $Id: patch.h,v 1.876 2003/01/20 08:54:54 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1043052497");		/* current unixtime */
+patch("1043052850");		/* current unixtime */
 /*
  *
  *
  */
-patch("write_ignores");
+patch("killtransfer-segv");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list