===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- src/usr.bin/ssh/readconf.c	2006/02/22 00:04:44	1.148
+++ src/usr.bin/ssh/readconf.c	2006/03/19 02:24:05	1.149
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.148 2006/02/22 00:04:44 stevesk Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.149 2006/03/19 02:24:05 djm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -323,7 +323,8 @@
 
 	s = line;
 	/* Get the keyword. (Each line is supposed to begin with a keyword). */
-	keyword = strdelim(&s);
+	if ((keyword = strdelim(&s)) == NULL)
+		return 0;
 	/* Ignore leading whitespace. */
 	if (*keyword == '\0')
 		keyword = strdelim(&s);