[cvslog] (2003-06-09 01:49:20 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sun Jun 8 19:49:20 CST 2003


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

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

Log message:

* Small fix to n_realloc(). Patch by Timothy Barbeisch.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.502 eggdrop1.6/doc/UPDATES1.6:1.503
--- eggdrop1.6/doc/UPDATES1.6:1.502	Sun May 11 18:53:24 2003
+++ eggdrop1.6/doc/UPDATES1.6	Sun Jun  8 20:49:10 2003
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.502 2003/05/11 23:53:24 wcc Exp $
+$Id: UPDATES1.6,v 1.503 2003/06/09 01:49:10 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by  Fixed by  What...
+          tchaika   small fix to n_realloc()
 Wanderer| Wcc       fixed output of tcl_duration to not return extra spaces
 paladinz  Wcc       don't compile inet_ntop compatability code unless USE_IPV6
                     is defined
Index: eggdrop1.6/src/mem.c
diff -u eggdrop1.6/src/mem.c:1.20 eggdrop1.6/src/mem.c:1.21
--- eggdrop1.6/src/mem.c:1.20	Thu Jan 30 01:15:14 2003
+++ eggdrop1.6/src/mem.c	Sun Jun  8 20:49:10 2003
@@ -3,7 +3,7 @@
  *   memory allocation and deallocation
  *   keeping track of what memory is being used by whom
  *
- * $Id: mem.c,v 1.20 2003/01/30 07:15:14 wcc Exp $
+ * $Id: mem.c,v 1.21 2003/06/09 01:49:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -344,7 +344,7 @@
     return n_malloc(size, file, line);
 
   x = (void *) realloc(ptr, size);
-  if (x == NULL) {
+  if (x == NULL && size > 0) {
     i = i;
     putlog(LOG_MISC, "*", "*** FAILED REALLOC %s (%d)", file, line);
     return NULL;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.997 eggdrop1.6/src/patch.h:1.998
--- eggdrop1.6/src/patch.h:1.997	Tue May 13 15:06:49 2003
+++ eggdrop1.6/src/patch.h	Sun Jun  8 20:49:10 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.997 2003/05/13 20:06:49 wcc Exp $
+ * $Id: patch.h,v 1.998 2003/06/09 01:49:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1052856282");            /* current unixtime */
+patch("1055122972");            /* current unixtime */
 /*
  *
  *
  */
-patch("channel-add-doc");
+patch("n_reallocfix");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list