upstream: fix SEGV on fatal() errors spotted by dtucker@

OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2

diff --git a/fatal.c b/fatal.c
index da5bf906986ae19122f80440e9a822fe48e1d7dd..16fbd320467a2ba5ff68a42e84b90ff31751ad45 100644 (file)
--- a/fatal.c
+++ b/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.
  *
@@ -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 3f6bedda8b60fedc81abb351fb9ed1409c377218..e01b6dd4d113ca7af92fcf8b1afaa88571673f20 100644 (file)
--- 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);
 }