- markus@cvs.openbsd.org 2005/05/16 15:30:51

     [readconf.c servconf.c]
     check return value from strdelim() for NULL (AddressFamily); mpech

diff --git a/ChangeLog b/ChangeLog
index c4c5e7ad621a2218614e790d1b2714671832aace..83235006dd0279d719805747c418c65d32f6c0b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
    - djm@cvs.openbsd.org 2005/05/10 10:30:43
      [ssh.c]
      report real errors on fallback from ControlMaster=no to normal connect
+   - markus@cvs.openbsd.org 2005/05/16 15:30:51
+     [readconf.c servconf.c]
+     check return value from strdelim() for NULL (AddressFamily); mpech
 
 20050524
  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]

diff --git a/readconf.c b/readconf.c
index 8ace1bbd454233996e96d48ca4aff7677e329d9c..d41220807ad0df0d9d38b969a2d477cb9b36af59 100644 (file)
--- 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;

diff --git a/servconf.c b/servconf.c
index 96ad18084c1b0c2d6a5897dae56d2b239b38ef01..ddb34f9b92fb3855d8e0c47115316499444216e8 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.140 2005/03/10 22:01:05 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.141 2005/05/16 15:30:51 markus Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -532,6 +532,9 @@ parse_time:
 
        case sAddressFamily:
                arg = strdelim(&cp);
+               if (!arg || *arg == '\0')
+                       fatal("%s line %d: missing address family.",
+                           filename, linenum);
                intptr = &options->address_family;
                if (options->listen_addrs != NULL)
                        fatal("%s line %d: address family must be specified before "