commit 17b23d86577314547647aeda2a0e1205026f1769
author Damien Miller <djm@mindrot.org> Thu May 26 12:11:56 2005 +1000
committer Damien Miller <djm@mindrot.org> Thu May 26 12:11:56 2005 +1000
tree da879089326fc1be022366f91bd32285776ae469
parent 538c9b71ecb11669053271ff95d7ce8a6d40294f

   - markus@cvs.openbsd.org 2005/05/16 15:30:51
     [readconf.c servconf.c]
     check return value from strdelim() for NULL (AddressFamily); mpech

readconf.c

diff --git a/readconf.c b/readconf.c
index 8ace1bb..d412208 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 @@
 
 	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;