- OpenBSD CVS:

   - [packet.c]
     getsockname() requires initialized tolen; andy@guildsoftware.com

diff --git a/CREDITS b/CREDITS
index ac992e300c8f2994f166024807e014bea5245f0e..03910b301d34ac37b68c3a0d5ff80e579c90bdb3 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -5,6 +5,7 @@ Theo de Raadt, and Dug Song - Creators of OpenSSH
 
 Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> - Bugfixes
 Andre Lucas <andre.lucas@dial.pipex.com> - build, login and many other fixes
+Andy Sloane <andy@guildsoftware.com> - bugfixes
 Ben Taylor <bent@clark.net> - Solaris debugging and fixes
 Chip Salzenberg <chip@valinux.com> - Assorted patches
 Chris Saia <csaia@wtower.com> - SuSE packaging

diff --git a/ChangeLog b/ChangeLog
index aec7a6d86be6a3b09a7f54c577afbdbd123c40dc..afc51024a8c4af55d650fa4d05a845423f609fe3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20000123
+ - OpenBSD CVS:
+   - [packet.c]
+     getsockname() requires initialized tolen; andy@guildsoftware.com
+
 20000122
  - Fix compilation of bsd-snprintf.c on Solaris, fix from Ben Taylor
    <bent@clark.net>

diff --git a/packet.c b/packet.c
index a8de0056d1fefba2cfcd8fe25d857018ee7fcf5d..9be0ad1be13b1b13231458c23f5680ea750fed20 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -136,7 +136,7 @@ int
 packet_connection_is_ipv4()
 {
        struct sockaddr_storage to;
-       socklen_t tolen;
+       socklen_t tolen = sizeof(to);
 
        memset(&to, 0, sizeof(to));
        if (getsockname(connection_out, (struct sockaddr *)&to, &tolen) < 0)