diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -45,6 +45,9 @@ | |||
45 | - markus@cvs.openbsd.org 2002/06/26 08:55:02 | 45 | - markus@cvs.openbsd.org 2002/06/26 08:55:02 |
46 | [channels.c] | 46 | [channels.c] |
47 | limit # of channels to 10000 | 47 | limit # of channels to 10000 |
48 | - markus@cvs.openbsd.org 2002/06/26 08:58:26 | ||
49 | [session.c] | ||
50 | limit # of env vars to 1000; ok deraadt/djm | ||
48 | 51 | ||
49 | 20020625 | 52 | 20020625 |
50 | - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh | 53 | - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh |
@@ -1144,4 +1147,4 @@ | |||
1144 | - (stevesk) entropy.c: typo in debug message | 1147 | - (stevesk) entropy.c: typo in debug message |
1145 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1148 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1146 | 1149 | ||
1147 | $Id: ChangeLog,v 1.2292 2002/06/26 09:14:43 djm Exp $ | 1150 | $Id: ChangeLog,v 1.2293 2002/06/26 09:15:07 djm Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.140 2002/06/23 21:06:41 deraadt Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.141 2002/06/26 08:58:26 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -849,6 +849,9 @@ child_set_env(char ***envp, u_int *envsizep, const char *name, | |||
849 | } else { | 849 | } else { |
850 | /* New variable. Expand if necessary. */ | 850 | /* New variable. Expand if necessary. */ |
851 | if (i >= (*envsizep) - 1) { | 851 | if (i >= (*envsizep) - 1) { |
852 | if (*envsizep >= 1000) | ||
853 | fatal("child_set_env: too many env vars," | ||
854 | " skipping: %.100s", name); | ||
852 | (*envsizep) += 50; | 855 | (*envsizep) += 50; |
853 | env = (*envp) = xrealloc(env, (*envsizep) * sizeof(char *)); | 856 | env = (*envp) = xrealloc(env, (*envsizep) * sizeof(char *)); |
854 | } | 857 | } |