- danh@cvs.openbsd.org 2001/08/27 22:02:13

     [ssh-keyscan.c]
     fix memory fault if non-existent filename is given to the -f option
     ok markus@

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b0d67df6d..1064c87fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,10 @@
    - stevesk@cvs.openbsd.org 2001/08/23 18:08:59
      [ssh-add.1 ssh-keyscan.1]
      minor cleanup
+   - danh@cvs.openbsd.org 2001/08/27 22:02:13
+     [ssh-keyscan.c]
+     fix memory fault if non-existent filename is given to the -f option
+     ok markus@
 
 20010815
  - (bal) Fixed stray code in readconf.c that went in by mistake.
@@ -6355,4 +6359,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1494 2001/09/12 17:06:13 mouring Exp $
+$Id: ChangeLog,v 1.1495 2001/09/12 17:10:40 mouring Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 3f8c5b403..9a9b72f4c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.27 2001/08/05 23:29:58 markus Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.28 2001/08/27 22:02:13 danh Exp $");
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
@@ -786,6 +786,8 @@ main(int argc, char **argv)
 
                 for (j = 0; j < fopt_count; j++) {
                         lb = Linebuf_alloc(argv[j], error);
+                        if (!lb)
+                                continue;
                         while ((line = Linebuf_getline(lb)) != NULL)
                                 do_host(line);
                         Linebuf_free(lb);