diff options
author | Damien Miller <djm@mindrot.org> | 2002-06-26 19:14:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-06-26 19:14:43 +1000 |
commit | 9403aa2f79cac6e1565324d5d33d572f62932187 (patch) | |
tree | 00aa0bbb4afdb6a21d125b87f3e3d44e987de121 | |
parent | 468cd716a54ac1fb85d24e6d270d824e460267b2 (diff) |
- markus@cvs.openbsd.org 2002/06/26 08:55:02
[channels.c]
limit # of channels to 10000
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -42,6 +42,9 @@ - markus@cvs.openbsd.org 2002/06/26 08:54:18 [buffer.c] limit append to 1MB and buffers to 10MB + - markus@cvs.openbsd.org 2002/06/26 08:55:02 + [channels.c] + limit # of channels to 10000 20020625 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh @@ -1141,4 +1144,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2291 2002/06/26 09:14:25 djm Exp $ +$Id: ChangeLog,v 1.2292 2002/06/26 09:14:43 djm Exp $ @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.178 2002/06/24 14:33:27 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.179 2002/06/26 08:55:02 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -229,6 +229,9 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, /* There are no free slots. Take last+1 slot and expand the array. */ found = channels_alloc; channels_alloc += 10; + if (channels_alloc > 10000) + fatal("channel_new: internal error: channels_alloc %d " + "too big.", channels_alloc); debug2("channel: expanding %d", channels_alloc); channels = xrealloc(channels, channels_alloc * sizeof(Channel *)); for (i = found; i < channels_alloc; i++) |