From eac66622a00b48f7b12fe4967484dd10243c94e0 Mon Sep 17 00:00:00 2001 From: Robert Drehmel Date: Sun, 23 Jun 2002 21:54:18 +0000 Subject: [PATCH] Allocate and clear the correct number of bytes for a struct fd_set that should be able to hold sock + 1 bits. Before, it was apparently assumed that an fd_mask has the same size as type char. PR: bin/39617 Reported by: Peter N Lewis --- contrib/traceroute/traceroute.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c index 8cfbfe3dbc01..487b7dbaed0f 100644 --- a/contrib/traceroute/traceroute.c +++ b/contrib/traceroute/traceroute.c @@ -906,9 +906,9 @@ wait_for_reply(register int sock, register struct sockaddr_in *fromp, int fromlen = sizeof(*fromp); nfds = howmany(sock + 1, NFDBITS); - if ((fdsp = malloc(nfds)) == NULL) + if ((fdsp = malloc(nfds * sizeof(fd_mask))) == NULL) err(1, "malloc"); - memset(fdsp, 0, nfds); + memset(fdsp, 0, nfds * sizeof(fd_mask)); FD_SET(sock, fdsp); wait.tv_sec = tp->tv_sec + waittime;