summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-01-20 17:59:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-01-20 17:59:41 +0000
commit686bb3c8047e468eeccd976e92ab3112d49edc95 (patch)
tree51482755629a8f8b6cab71131f2292a59326edfe
parentab992ef793799c71f418114086a889e96c857d7d (diff)
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index f6fa869a8e7..cdcb5ea4235 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.55 2001/01/19 15:55:11 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.56 2001/01/20 17:59:40 deraadt Exp $");
#include "ssh.h"
#include "readconf.h"
@@ -246,7 +246,7 @@ process_config_line(Options *options, const char *host,
/* Ignore leading whitespace. */
if (*keyword == '\0')
keyword = strdelim(&s);
- if (!*keyword || *keyword == '\n' || *keyword == '#')
+ if (keyword == NULL || !*keyword || *keyword == '\n' || *keyword == '#')
return 0;
opcode = parse_token(keyword, filename, linenum);