From c0fd17fdca5853c0c6bfdfc364d8c5418dcab86b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 26 Jun 2000 10:22:53 +1000 Subject: [PATCH] - OpenBSD CVS update - provos@cvs.openbsd.org 2000/06/25 14:17:58 [channels.c] correct check for bad channel ids; from Wei Dai --- ChangeLog | 8 ++++++-- channels.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b67efd293..a5d6cd09b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 20000626 - - Better fix to aclocal tests from Garrick James - + - (djm) Better fix to aclocal tests from Garrick James + - OpenBSD CVS update + - provos@cvs.openbsd.org 2000/06/25 14:17:58 + [channels.c] + correct check for bad channel ids; from Wei Dai + 20000623 - (djm) Use sa_family_t in prototype for rresvport_af. Patch from Svante Signell diff --git a/channels.c b/channels.c index 038670da2..3710b2fd4 100644 --- a/channels.c +++ b/channels.c @@ -17,7 +17,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.62 2000/06/20 01:39:39 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.63 2000/06/25 20:17:57 provos Exp $"); #include "ssh.h" #include "packet.h" @@ -135,7 +135,7 @@ Channel * channel_lookup(int id) { Channel *c; - if (id < 0 && id > channels_alloc) { + if (id < 0 || id > channels_alloc) { log("channel_lookup: %d: bad id", id); return NULL; }