diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-12 17:10:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-12 17:10:40 +0000 |
commit | 78bbd9ebe348a4dc5dda23db4e281d90eeef85d5 (patch) | |
tree | a767e9c96116d03ef26a492d7b938250b52a2376 | |
parent | 8d066fb262af638d0110437afa794ce46387e0dd (diff) |
- 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@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-keyscan.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -32,6 +32,10 @@ | |||
32 | - stevesk@cvs.openbsd.org 2001/08/23 18:08:59 | 32 | - stevesk@cvs.openbsd.org 2001/08/23 18:08:59 |
33 | [ssh-add.1 ssh-keyscan.1] | 33 | [ssh-add.1 ssh-keyscan.1] |
34 | minor cleanup | 34 | minor cleanup |
35 | - danh@cvs.openbsd.org 2001/08/27 22:02:13 | ||
36 | [ssh-keyscan.c] | ||
37 | fix memory fault if non-existent filename is given to the -f option | ||
38 | ok markus@ | ||
35 | 39 | ||
36 | 20010815 | 40 | 20010815 |
37 | - (bal) Fixed stray code in readconf.c that went in by mistake. | 41 | - (bal) Fixed stray code in readconf.c that went in by mistake. |
@@ -6355,4 +6359,4 @@ | |||
6355 | - Wrote replacements for strlcpy and mkdtemp | 6359 | - Wrote replacements for strlcpy and mkdtemp |
6356 | - Released 1.0pre1 | 6360 | - Released 1.0pre1 |
6357 | 6361 | ||
6358 | $Id: ChangeLog,v 1.1494 2001/09/12 17:06:13 mouring Exp $ | 6362 | $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 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.27 2001/08/05 23:29:58 markus Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.28 2001/08/27 22:02:13 danh Exp $"); |
11 | 11 | ||
12 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | 12 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) |
13 | #include <sys/queue.h> | 13 | #include <sys/queue.h> |
@@ -786,6 +786,8 @@ main(int argc, char **argv) | |||
786 | 786 | ||
787 | for (j = 0; j < fopt_count; j++) { | 787 | for (j = 0; j < fopt_count; j++) { |
788 | lb = Linebuf_alloc(argv[j], error); | 788 | lb = Linebuf_alloc(argv[j], error); |
789 | if (!lb) | ||
790 | continue; | ||
789 | while ((line = Linebuf_getline(lb)) != NULL) | 791 | while ((line = Linebuf_getline(lb)) != NULL) |
790 | do_host(line); | 792 | do_host(line); |
791 | Linebuf_free(lb); | 793 | Linebuf_free(lb); |