- (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug

message on some platforms.  Patch from pete at seebeyond.com via djm.
This commit is contained in:
Darren Tucker 2005-03-31 21:51:54 +10:00
parent f3bb434177
commit 73ba43798a
2 changed files with 5 additions and 1 deletions

View File

@ -15,6 +15,8 @@
- (dtucker) [auth.h sshd.c openbsd-compat/port-aix.c] Bug #1006: fix bug in - (dtucker) [auth.h sshd.c openbsd-compat/port-aix.c] Bug #1006: fix bug in
handling of password expiry messages returned by AIX's authentication handling of password expiry messages returned by AIX's authentication
routines, originally reported by robvdwal at sara.nl. routines, originally reported by robvdwal at sara.nl.
- (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug
message on some platforms. Patch from pete at seebeyond.com via djm.
20050329 20050329
- (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're
@ -2405,4 +2407,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.3732 2005/03/31 11:39:25 dtucker Exp $ $Id: ChangeLog,v 1.3733 2005/03/31 11:51:54 dtucker Exp $

2
ssh.c
View File

@ -876,6 +876,8 @@ ssh_init_forwarding(void)
for (i = 0; i < options.num_remote_forwards; i++) { for (i = 0; i < options.num_remote_forwards; i++) {
debug("Remote connections from %.200s:%d forwarded to " debug("Remote connections from %.200s:%d forwarded to "
"local address %.200s:%d", "local address %.200s:%d",
(options.remote_forwards[i].listen_host == NULL) ?
(options.gateway_ports ? "*" : "LOCALHOST") :
options.remote_forwards[i].listen_host, options.remote_forwards[i].listen_host,
options.remote_forwards[i].listen_port, options.remote_forwards[i].listen_port,
options.remote_forwards[i].connect_host, options.remote_forwards[i].connect_host,