summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2003-06-26 20:08:34 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2003-06-26 20:08:34 +0000
commit08f1dc53b41d16312c13f5b43c48e4f2125872af (patch)
tree136f66e16220d450647c3abd311bd7cf0487acf3 /usr.bin
parent8f8204133ae01a2473bb04599568349f9de3eb9e (diff)
do not dump core for 'ssh -o proxycommand host'; ok deraadt@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 7af9af25fae..9c4bd8bf33c 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.112 2003/05/16 03:27:12 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.113 2003/06/26 20:08:33 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -544,6 +544,8 @@ parse_string:
goto parse_string;
case oProxyCommand:
+ if (s == NULL)
+ fatal("%.200s line %d: Missing argument.", filename, linenum);
charptr = &options->proxy_command;
len = strspn(s, WHITESPACE "=");
if (*activep && *charptr == NULL)