From a7270309fc5e95b29c91d0190b13ef5a9b1df339 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 6 Jul 2005 09:36:05 +1000 Subject: - markus@cvs.openbsd.org 2005/07/01 13:19:47 [channels.c] don't free() if getaddrinfo() fails; report mpech@ --- ChangeLog | 8 +++++++- channels.c | 12 +++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 261373c03..85d4e91c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20050706 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2005/07/01 13:19:47 + [channels.c] + don't free() if getaddrinfo() fails; report mpech@ + 20050626 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2005/06/17 22:53:47 @@ -2763,4 +2769,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.3831 2005/06/25 22:56:48 djm Exp $ +$Id: ChangeLog,v 1.3832 2005/07/05 23:36:05 djm Exp $ diff --git a/channels.c b/channels.c index 7ca1c53ba..b58902328 100644 --- a/channels.c +++ b/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.217 2005/06/17 02:44:32 djm Exp $"); +RCSID("$OpenBSD: channels.c,v 1.218 2005/07/01 13:19:47 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2196,11 +2196,11 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por if (host == NULL) { error("No forward host name."); - return success; + return 0; } if (strlen(host) > SSH_CHANNEL_PATH_LEN - 1) { error("Forward host name too long."); - return success; + return 0; } /* @@ -2251,12 +2251,10 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por packet_disconnect("getaddrinfo: fatal error: %s", gai_strerror(r)); } else { - verbose("channel_setup_fwd_listener: " - "getaddrinfo(%.64s): %s", addr, gai_strerror(r)); - packet_send_debug("channel_setup_fwd_listener: " + error("channel_setup_fwd_listener: " "getaddrinfo(%.64s): %s", addr, gai_strerror(r)); } - aitop = NULL; + return 0; } for (ai = aitop; ai; ai = ai->ai_next) { -- cgit v1.2.3