tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2005/07/01 13:19:47 

[channels.c]
     don't free() if getaddrinfo() fails; report mpech@
This commit is contained in:
Damien Miller 2005-07-06 09:36:05 +10:00
parent dba6354c05
commit a7270309fc
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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 20050626
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2005/06/17 22:53:47 - djm@cvs.openbsd.org 2005/06/17 22:53:47
@ -2763,4 +2769,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

12
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "ssh1.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) { if (host == NULL) {
error("No forward host name."); error("No forward host name.");
return success; return 0;
} }
if (strlen(host) > SSH_CHANNEL_PATH_LEN - 1) { if (strlen(host) > SSH_CHANNEL_PATH_LEN - 1) {
error("Forward host name too long."); 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", packet_disconnect("getaddrinfo: fatal error: %s",
gai_strerror(r)); gai_strerror(r));
} else { } else {
verbose("channel_setup_fwd_listener: " error("channel_setup_fwd_listener: "
"getaddrinfo(%.64s): %s", addr, gai_strerror(r));
packet_send_debug("channel_setup_fwd_listener: "
"getaddrinfo(%.64s): %s", addr, gai_strerror(r)); "getaddrinfo(%.64s): %s", addr, gai_strerror(r));
} }
aitop = NULL; return 0;
} }
for (ai = aitop; ai; ai = ai->ai_next) { for (ai = aitop; ai; ai = ai->ai_next) {