From a6a30f6f7be1f5d93a7e48fa8a1f5853576da4a3 Mon Sep 17 00:00:00 2001 From: nenolod Date: Mon, 5 Mar 2007 10:42:24 -0800 Subject: [PATCH] [svn] - avoid some potential NULL dereferencing --- ChangeLog | 9 +++++++++ include/serno.h | 2 +- libcharybdis/commio.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab1c1222..9545086e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +nenolod 2007/03/05 18:41:14 UTC (20070305-3245) + Log: + - fix a typo + + + Changes: Modified: + +1 -1 trunk/libcharybdis/poll.c (File Modified) + + nenolod 2007/03/05 18:40:39 UTC (20070305-3243) Log: - rework poll a bit for the MAXCONNECTIONS changes. diff --git a/include/serno.h b/include/serno.h index e76de815..29364024 100644 --- a/include/serno.h +++ b/include/serno.h @@ -1 +1 @@ -#define SERNO "20070305-3243" +#define SERNO "20070305-3245" diff --git a/libcharybdis/commio.c b/libcharybdis/commio.c index 4dc50201..2985fc2f 100644 --- a/libcharybdis/commio.c +++ b/libcharybdis/commio.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: commio.c 3239 2007-03-05 17:41:40Z jilles $ + * $Id: commio.c 3247 2007-03-05 18:42:24Z nenolod $ */ #include "libcharybdis.h" @@ -740,7 +740,7 @@ fdlist_update_biggest(int fd, int opening) * re-opening it */ s_assert(!opening); - while (highest_fd >= 0 && comm_locate_fd(fd)->flags.open) /* XXX */ + while (highest_fd >= 0 && comm_locate_fd(fd) != NULL) highest_fd--; }