2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c58f63cd3..7a92e6541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - djm@cvs.openbsd.org 2004/05/26 08:59:57
      [sftp.c]
      exit -> _exit in forked child on error; from andrushock AT korovino.net
+   - markus@cvs.openbsd.org 2004/05/26 23:02:39
+     [channels.c]
+     missing freeaddrinfo; Andrey Matveev
 
 20040603
  - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
@@ -1187,4 +1190,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3375 2004/06/15 00:24:13 djm Exp $
+$Id: ChangeLog,v 1.3376 2004/06/15 00:27:15 djm Exp $
diff --git a/channels.c b/channels.c
index 2b1ce0e5c..437befa34 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.202 2004/05/21 11:33:11 djm Exp $");
+RCSID("$OpenBSD: channels.c,v 1.203 2004/05/26 23:02:39 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -2570,6 +2570,7 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                         if (sock < 0) {
                                 if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) {
                                         error("socket: %.100s", strerror(errno));
+                                        freeaddrinfo(aitop);
                                         return -1;
                                 } else {
                                         debug("x11_create_display_inet: Socket family %d not supported",