diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-19 08:07:08 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-19 19:09:08 +1100 |
| commit | f7bd11e4941620991f3e727cd0131b01f0311a58 (patch) | |
| tree | f35ee86ce6420e408d762113d2f9d07bb2bd2599 | |
| parent | 7715a3b171049afa1feffb1d5a1245dfac36ce99 (diff) | |
upstream: fix SEGV on fatal() errors spotted by dtucker@
OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2
| -rw-r--r-- | fatal.c | 4 | ||||
| -rw-r--r-- | ssh-keyscan.c | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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. * @@ -40,7 +40,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/ssh-keyscan.c b/ssh-keyscan.c index 3f6bedda..e01b6dd4 100644 --- a/ssh-keyscan.c +++ b/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>. * @@ -641,7 +641,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); } |