[cvslog] (2003-11-26 16:01:21 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Wed Nov 26 10:01:21 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-11-26 16:01:21 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/patch.h src/mod/filesys.mod/filedb3.c

Log message:

* Fixed a getdesc segfault when a file has no description. Patch by dw.
  Found by R. Ramos.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.514 eggdrop1.6/doc/UPDATES1.6:1.515
--- eggdrop1.6/doc/UPDATES1.6:1.514	Sat Nov  1 17:26:56 2003
+++ eggdrop1.6/doc/UPDATES1.6	Wed Nov 26 10:01:10 2003
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.514 2003/11/01 23:26:56 wcc Exp $
+$Id: UPDATES1.6,v 1.515 2003/11/26 16:01:10 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by     Fixed by  What...
+R. Ramos     dw        fixed a getdesc segfault when a file has no desc
 various      Wcc       removed IPv6 for now, will be implemented in a more
                        proper way in an upcoming release
              BarkerJr  cleaned up "illegal channel option" Tcl errors
Index: eggdrop1.6/src/mod/filesys.mod/filedb3.c
diff -u eggdrop1.6/src/mod/filesys.mod/filedb3.c:1.27 eggdrop1.6/src/mod/filesys.mod/filedb3.c:1.28
--- eggdrop1.6/src/mod/filesys.mod/filedb3.c:1.27	Wed Mar 12 02:42:00 2003
+++ eggdrop1.6/src/mod/filesys.mod/filedb3.c	Wed Nov 26 10:01:10 2003
@@ -4,7 +4,7 @@
  *
  * Rewritten by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: filedb3.c,v 1.27 2003/03/12 08:42:00 wcc Exp $
+ * $Id: filedb3.c,v 1.28 2003/11/26 16:01:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1103,8 +1103,10 @@
 
   fdbe = filedb_getentry(dir, fn);
   if (fdbe) {
-    *desc = nmalloc(strlen(fdbe->desc) + 1);
-    strcpy(*desc, fdbe->desc);
+    if (fdbe->desc) {
+      *desc = nmalloc(strlen(fdbe->desc) + 1);
+      strcpy(*desc, fdbe->desc);
+    }
     free_fdbe(&fdbe);
   } else
     *desc = NULL;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1010 eggdrop1.6/src/patch.h:1.1011
--- eggdrop1.6/src/patch.h:1.1010	Sun Nov 23 10:10:09 2003
+++ eggdrop1.6/src/patch.h	Wed Nov 26 10:01:10 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1010 2003/11/23 16:10:09 wcc Exp $
+ * $Id: patch.h,v 1.1011 2003/11/26 16:01:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1069603808");            /* current unixtime */
+patch("1069862390");            /* current unixtime */
 /*
  *
  *
  */
-patch("experience");
+patch("getdesc-crash");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list