diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2020-10-19 08:07:09 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2020-10-19 08:07:09 +0000 |
| commit | 8ba6e14b0911f54e58758432a9627db7aecdfeca (patch) | |
| tree | 66b8ad181be1887ddfc907e22efc67b5da5f2856 /usr.bin/ssh | |
| parent | b5231483d4ecce974886ed25bd08c8ec7613cede (diff) | |
fix SEGV on fatal() errors spotted by dtucker@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/fatal.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/fatal.c b/usr.bin/ssh/fatal.c index 996dbdb171c..e1dd843e1e4 100644 --- a/usr.bin/ssh/fatal.c +++ b/usr.bin/ssh/fatal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fatal.c,v 1.10 2020/10/18 11:21:59 djm Exp $ */ +/* $OpenBSD: fatal.c,v 1.11 2020/10/19 08:07:08 djm Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -38,7 +38,7 @@ sshfatal(const char *file, const char *func, int line, int showfunc, va_list args; va_start(args, fmt); - sshlog(file, func, line, showfunc, level, suffix, fmt, args); + sshlogv(file, func, line, showfunc, level, suffix, fmt, args); va_end(args); cleanup_exit(255); } diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 18c0144c17a..04b12e81f38 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.136 2020/10/18 11:32:02 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.137 2020/10/19 08:07:08 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -623,7 +623,7 @@ sshfatal(const char *file, const char *func, int line, int showfunc, va_list args; va_start(args, fmt); - sshlog(file, func, line, showfunc, level, suffix, fmt, args); + sshlogv(file, func, line, showfunc, level, suffix, fmt, args); va_end(args); cleanup_exit(255); } |