- markus@cvs.openbsd.org 2003/06/29 12:44:38

     [sshconnect.c]
     memset 0, not \0; andrushock@korovino.net

diff --git a/ChangeLog b/ChangeLog
index 8fdfce19763cdd1700b588522059cbd309173c1e..ee5276502b0a8b05d95cdb1d89f56b8be50c3191 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
      progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
      sshd.c]
      deal with typing of write vs read in atomicio
+   - markus@cvs.openbsd.org 2003/06/29 12:44:38
+     [sshconnect.c]
+     memset 0, not \0; andrushock@korovino.net
 
 20030630
  - (djm) Search for support functions necessary to build our 
@@ -629,4 +632,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2837 2003/07/03 03:46:56 dtucker Exp $
+$Id: ChangeLog,v 1.2838 2003/07/03 03:48:04 dtucker Exp $

diff --git a/sshconnect.c b/sshconnect.c
index 364a62281df6637fd6f70fc2215bcf42ee9b7963..40d22800fcc35d62a22908f90506e4413ade7569 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.146 2003/06/28 16:23:06 deraadt Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.147 2003/06/29 12:44:38 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -246,7 +246,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
        fdsetsz = howmany(sockfd + 1, NFDBITS) * sizeof(fd_mask);
        fdset = (fd_set *)xmalloc(fdsetsz);
 
-       memset(fdset, '\0', fdsetsz);
+       memset(fdset, 0, fdsetsz);
        FD_SET(sockfd, fdset);
        tv.tv_sec = timeout;
        tv.tv_usec = 0;