summaryrefslogtreecommitdiffstats
path: root/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-26 12:11:56 +1000
committerDamien Miller <djm@mindrot.org>2005-05-26 12:11:56 +1000
commit17b23d86577314547647aeda2a0e1205026f1769 (patch)
treeda879089326fc1be022366f91bd32285776ae469 /readconf.c
parent538c9b71ecb11669053271ff95d7ce8a6d40294f (diff)
- markus@cvs.openbsd.org 2005/05/16 15:30:51
[readconf.c servconf.c] check return value from strdelim() for NULL (AddressFamily); mpech
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index 8ace1bbd..d4122080 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.139 2005/03/10 22:01:05 deraadt Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.140 2005/05/16 15:30:51 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -743,6 +743,9 @@ parse_int:
case oAddressFamily:
arg = strdelim(&s);
+ if (!arg || *arg == '\0')
+ fatal("%s line %d: missing address family.",
+ filename, linenum);
intptr = &options->address_family;
if (strcasecmp(arg, "inet") == 0)
value = AF_INET;