[cvslog] (2004-12-02 23:36:57 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Thu Dec 2 17:36:57 CST 2004


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2004-12-02 23:36:57 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

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

Log message:

- Fixed 3 invalid reads in notes.c.
* Patch by: rush at winkey.oompah.org

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.595 eggdrop1.6/doc/UPDATES1.6:1.596
--- eggdrop1.6/doc/UPDATES1.6:1.595	Sat Aug 28 01:50:35 2004
+++ eggdrop1.6/doc/UPDATES1.6	Thu Dec  2 17:36:47 2004
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.595 2004/08/28 06:50:35 wcc Exp $
+$Id: UPDATES1.6,v 1.596 2004/12/02 23:36:47 wcc Exp $
 
 Eggdrop Changes (since v1.6.0)
     _____________________________________________________________________
@@ -11,6 +11,9 @@
     ftp://ftp.eggheads.org/pub/eggdrop/UPDATES/
 
   1.6.18:
+    - Fixed 3 invalid reads in notes.c.
+    * Patch by: rush at winkey.oompah.org
+
     - Corrected a few of the error messages in neterror().
     * Found by: Steven Nikkel - Patch by: Wcc
 
Index: eggdrop1.6/src/mod/notes.mod/notes.c
diff -u eggdrop1.6/src/mod/notes.mod/notes.c:1.52 eggdrop1.6/src/mod/notes.mod/notes.c:1.53
--- eggdrop1.6/src/mod/notes.mod/notes.c:1.52	Fri Jul  2 16:02:02 2004
+++ eggdrop1.6/src/mod/notes.mod/notes.c	Thu Dec  2 17:36:47 2004
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  *
- * $Id: notes.c,v 1.52 2004/07/02 21:02:02 wcc Exp $
+ * $Id: notes.c,v 1.53 2004/12/02 23:36:47 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -404,8 +404,7 @@
   read = 0;
   erased = 0;
   notes_parse(nl, (argv[2][0] == 0) ? "-" : argv[2]);
-  while (!feof(f)) {
-    fgets(s, 600, f);
+  while (!feof(f) && fgets(s, 600, f)) {
     if (s[strlen(s) - 1] == '\n')
       s[strlen(s) - 1] = 0;
     if (!feof(f)) {
@@ -492,8 +491,7 @@
     return;
   }
   notes_parse(rd, srd);
-  while (!feof(f)) {
-    fgets(s, 600, f);
+  while (!feof(f) && fgets(s, 600, f)) {
     i = strlen(s);
     if (i > 0 && s[i - 1] == '\n')
       s[i - 1] = 0;
@@ -691,8 +689,7 @@
   count = 0;
   read = 0;
   notes_parse(nl, (argv[2][0] == 0) ? "-" : argv[2]);
-  while (!feof(f)) {
-    fgets(s, 600, f);
+  while (!feof(f) && fgets(s, 600, f)) {
     if (s[strlen(s) - 1] == '\n')
       s[strlen(s) - 1] = 0;
     if (!feof(f)) {
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1136 eggdrop1.6/src/patch.h:1.1137
--- eggdrop1.6/src/patch.h:1.1136	Thu Sep  2 17:49:25 2004
+++ eggdrop1.6/src/patch.h	Thu Dec  2 17:36:47 2004
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1136 2004/09/02 22:49:25 wcc Exp $
+ * $Id: patch.h,v 1.1137 2004/12/02 23:36:47 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1094165344");            /* current unixtime */
+patch("1102030293");            /* current unixtime */
 /*
  *
  *
  */
-patch("smallfixes");
+patch("notesfix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list