summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-03-05 01:57:44 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-03-05 01:57:44 +0000
commit795488785e1e1273c628e25fb91a45e048984bb3 (patch)
tree1c45ac0c2fefd7cc64e59888b9e5f9940f85963d
parent6b28c35a04069c5b19e541c86e767da5841422d0 (diff)
- markus@cvs.openbsd.org 2002/03/04 19:37:58
[channels.c] off by one; thanks to joost@pine.nl
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d8dc035bb..4fdc2918f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,9 @@
58 [ssh-keyscan.c] 58 [ssh-keyscan.c]
59 handle connection close during read of protocol version string. 59 handle connection close during read of protocol version string.
60 fixes erroneous "bad greeting". ok markus@ 60 fixes erroneous "bad greeting". ok markus@
61 - markus@cvs.openbsd.org 2002/03/04 19:37:58
62 [channels.c]
63 off by one; thanks to joost@pine.nl
61 64
6220020226 6520020226
63 - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests 66 - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
@@ -7789,4 +7792,4 @@
7789 - Wrote replacements for strlcpy and mkdtemp 7792 - Wrote replacements for strlcpy and mkdtemp
7790 - Released 1.0pre1 7793 - Released 1.0pre1
7791 7794
7792$Id: ChangeLog,v 1.1905 2002/03/05 01:54:52 mouring Exp $ 7795$Id: ChangeLog,v 1.1906 2002/03/05 01:57:44 mouring Exp $
diff --git a/channels.c b/channels.c
index d5a24311c..2b1f33f34 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.170 2002/02/27 21:23:13 stevesk Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.171 2002/03/04 19:37:58 markus Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -146,7 +146,7 @@ channel_lookup(int id)
146{ 146{
147 Channel *c; 147 Channel *c;
148 148
149 if (id < 0 || id > channels_alloc) { 149 if (id < 0 || id >= channels_alloc) {
150 log("channel_lookup: %d: bad id", id); 150 log("channel_lookup: %d: bad id", id);
151 return NULL; 151 return NULL;
152 } 152 }