[openssh-commits] [openssh] 01/01: upstream: fix SEGV on fatal() errors spotted by dtucker@

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit f7bd11e4941620991f3e727cd0131b01f0311a58
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Oct 19 08:07:08 2020 +0000

    upstream: fix SEGV on fatal() errors spotted by dtucker@
    
    OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2
---
 fatal.c       | 4 ++--
 ssh-keyscan.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fatal.c b/fatal.c
index da5bf906..16fbd320 100644
--- 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 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 at 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);
 }

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.