From 920706fdd7a3b31e35b3b90c66c9a8d772fd38fc Mon Sep 17 00:00:00 2001 From: djm Date: Wed, 28 Jan 2009 05:30:33 +0000 Subject: [PATCH] - djm@cvs.openbsd.org 2009/01/22 09:49:57 [channels.c] oops! I committed the wrong version of the Channel->path diff, it was missing some tweaks suggested by stevesk@ --- ChangeLog | 4 ++++ channels.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a331ea4a..7b475ff9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,10 @@ [channels.c channels.h session.c] make Channel->path an allocated string, saving a few bytes here and there and fixing bz#1380 in the process; ok markus@ + - djm@cvs.openbsd.org 2009/01/22 09:49:57 + [channels.c] + oops! I committed the wrong version of the Channel->path diff, + it was missing some tweaks suggested by stevesk@ 20090107 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. diff --git a/channels.c b/channels.c index e6c08b62..0b1c34c8 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.293 2009/01/22 09:46:01 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.294 2009/01/22 09:49:57 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1181,7 +1181,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset) c->path = NULL; } if (s5_req.atyp == SSH_SOCKS5_DOMAIN) { - if (addrlen > NI_MAXHOST - 1) { + if (addrlen >= NI_MAXHOST) { error("channel %d: dynamic request: socks5 hostname " "\"%.100s\" too long", c->self, dest_addr); return -1; @@ -2477,7 +2477,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por error("No forward host name."); return 0; } - if (strlen(host) > NI_MAXHOST) { + if (strlen(host) >= NI_MAXHOST) { error("Forward host name too long."); return 0; } -- 2.45.2