1 files changed, 10 insertions, 14 deletions

diff --git a/session.c b/session.c
index 2898ac518..4497f5c0b 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.164 2003/09/18 08:49:45 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.163 2003/08/31 13:29:05 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -798,9 +798,8 @@ void
 child_set_env(char ***envp, u_int *envsizep, const char *name,
         const char *value)
 {
-        char **env;
-        u_int envsize;
         u_int i, namelen;
+        char **env;
 
         /*
          * If we're passed an uninitialized list, allocate a single null
@@ -827,13 +826,12 @@ child_set_env(char ***envp, u_int *envsizep, const char *name,
                 xfree(env[i]);
         } else {
                 /* New variable.  Expand if necessary. */
-                envsize = *envsizep;
-                if (i >= envsize - 1) {
-                        if (envsize >= 1000)
-                                fatal("child_set_env: too many env vars");
-                        envsize += 50;
-                        env = (*envp) = xrealloc(env, envsize * sizeof(char *));
-                        *envsizep = envsize;
+                if (i >= (*envsizep) - 1) {
+                        if (*envsizep >= 1000)
+                                fatal("child_set_env: too many env vars,"
+                                    " skipping: %.100s", name);
+                        (*envsizep) += 50;
+                        env = (*envp) = xrealloc(env, (*envsizep) * sizeof(char *));
                 }
                 /* Need to set the NULL pointer at end of array beyond the new slot. */
                 env[i + 1] = NULL;
@@ -914,7 +912,8 @@ static void
 read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
 {
         char **tmpenv = NULL, *var;
-        u_int i, tmpenvsize = 0;
+        u_int i;
+        size_t tmpenvsize = 0;
         mode_t mask;
 
         /*
@@ -924,9 +923,6 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
          */
         read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login");
 
-        if (tmpenv == NULL)
-                return;
-
         if (uid == 0)
                 var = child_get_env(tmpenv, "SUPATH");
         else