diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-06-28 12:40:12 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-06-28 12:40:12 +1000 |
commit | a99c1b77ab1c866d42ebc48c86da5767b2f6f53d (patch) | |
tree | 1da2aeaf17ce59d7cf6c63624d60dcff07df1e11 /readconf.c | |
parent | a6612d43cf0ef743649bdac9d13bc2cff4f79cc5 (diff) |
- markus@cvs.openbsd.org 2003/06/26 20:08:33
[readconf.c]
do not dump core for 'ssh -o proxycommand host'; ok deraadt@
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index 2a77ea14f..a01d7a33e 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.112 2003/05/16 03:27:12 djm Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.113 2003/06/26 20:08:33 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -546,6 +546,8 @@ parse_string: | |||
546 | goto parse_string; | 546 | goto parse_string; |
547 | 547 | ||
548 | case oProxyCommand: | 548 | case oProxyCommand: |
549 | if (s == NULL) | ||
550 | fatal("%.200s line %d: Missing argument.", filename, linenum); | ||
549 | charptr = &options->proxy_command; | 551 | charptr = &options->proxy_command; |
550 | len = strspn(s, WHITESPACE "="); | 552 | len = strspn(s, WHITESPACE "="); |
551 | if (*activep && *charptr == NULL) | 553 | if (*activep && *charptr == NULL) |