1 files changed, 4 insertions, 3 deletions

diff --git a/session.c b/session.c
index c19c2ac5a..2b0580b45 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.223 2007/08/23 02:55:51 djm Exp $ */
+/* $OpenBSD: session.c,v 1.224 2007/09/11 15:47:17 gilles Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -897,8 +897,9 @@ read_environment_file(char ***env, u_int *envsize,
                         ;
                 if (!*cp || *cp == '#' || *cp == '\n')
                         continue;
-                if (strchr(cp, '\n'))
-                        *strchr(cp, '\n') = '\0';
+
+                cp[strcspn(cp, "\n")] = '\0';
+
                 value = strchr(cp, '=');
                 if (value == NULL) {
                         fprintf(stderr, "Bad line %u in %.100s\n", lineno,