From: wessels <>
Date: Thu, 11 May 2000 09:05:23 +0000 (+0000)
Subject: DW:
X-Git-Tag: SQUID_3_0_PRE1~1985
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41292f7937e6b8a499d34264aae8cab47e3bec22;p=thirdparty%2Fsquid.git

DW:
 Benno Rice (benno@netizen.com.au) reports "two instances where
 read handlers were treating their fd_table read data as a pointer
 to an int and attempting to increment it, even though NULL was
 passed, or somesuch"
---

diff --git a/src/client_side.cc b/src/client_side.cc
index fda78752c9..4732b67737 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.480 2000/05/07 16:18:19 adrian Exp $
+ * $Id: client_side.cc,v 1.481 2000/05/11 03:05:23 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2684,6 +2684,7 @@ httpAccept(int sock, void *data)
 	commSetSelect(fd, COMM_SELECT_READ, clientReadRequest, connState, 0);
 	commSetDefer(fd, clientReadDefer, connState);
 	clientdbEstablished(peer.sin_addr, 1);
+	assert(N);
 	(*N)++;
     }
 }
diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 6d62d0da7f..545eb9b201 100644
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.22 2000/05/02 22:34:46 hno Exp $
+ * $Id: dns_internal.cc,v 1.23 2000/05/11 03:05:24 wessels Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -322,6 +322,7 @@ idnsRead(int fd, void *data)
 	    break;
 	}
 	fd_bytes(DnsSocket, len, FD_READ);
+	assert(N);
 	(*N)++;
 	debug(78, 3) ("idnsRead: FD %d: received %d bytes from %s.\n",
 	    fd,