From eaffb9d6b6daafdfba60e76f766ed0dbf69c3d60 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 6 Dec 2001 16:28:19 +0000 Subject: - markus@cvs.openbsd.org 2001/11/16 12:46:13 [ssh-keyscan.c] handle empty lines instead of dumping core; report from sha@sha-1.net --- ChangeLog | 5 ++++- ssh-keyscan.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6ec3bd1c..1cbe63d1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ - deraadt@cvs.openbsd.org 2001/11/14 20:45:08 [sshd.c] errno saving wrapping in a signal handler + - markus@cvs.openbsd.org 2001/11/16 12:46:13 + [ssh-keyscan.c] + handle empty lines instead of dumping core; report from sha@sha-1.net 20011126 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, @@ -6925,4 +6928,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1667 2001/12/06 16:19:01 mouring Exp $ +$Id: ChangeLog,v 1.1668 2001/12/06 16:28:19 mouring Exp $ diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 3fbe88d56..62204102b 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.30 2001/10/08 19:05:05 markus Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.31 2001/11/16 12:46:13 markus Exp $"); #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #include @@ -647,6 +647,8 @@ do_host(char *host) char *name = strnnsep(&host, " \t\n"); int j; + if (name == NULL) + return; for (j = KT_RSA1; j <= KT_RSA; j *= 2) { if (get_keytypes & j) { while (ncon >= MAXCON) -- cgit v1.2.3