summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2001-01-20 23:00:56 +0000
committerdjm <djm@openbsd.org>2001-01-20 23:00:56 +0000
commit3a484a67d38d9e03270f21d27d538bcfd3397263 (patch)
tree111ff30fd5146e38b5a9d8faa0d171ae46d9e038
parentdo not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net (diff)
downloadwireguard-openbsd-3a484a67d38d9e03270f21d27d538bcfd3397263.tar.xz
wireguard-openbsd-3a484a67d38d9e03270f21d27d538bcfd3397263.zip
Check for NULL return from strdelim; ok markus
-rw-r--r--usr.bin/ssh/servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 3da10ff2ddd..036eeb63289 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.60 2001/01/19 15:55:11 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.61 2001/01/20 23:00:56 djm Exp $");
#include "ssh.h"
#include "servconf.h"
@@ -333,7 +333,7 @@ read_server_config(ServerOptions *options, const char *filename)
/* Ignore leading whitespace */
if (*arg == '\0')
arg = strdelim(&cp);
- if (!*arg || *arg == '#')
+ if (!arg || !*arg || *arg == '#')
continue;
intptr = NULL;
charptr = NULL;