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

OpenBSD-Commit-ID: 75f155a1ac61e364ed00dc379e2c42df81067ce2
This commit is contained in:
djm@openbsd.org 2020-10-19 08:07:08 +00:00 committed by Damien Miller
parent 7715a3b171
commit f7bd11e494
2 changed files with 4 additions and 4 deletions

View File

@ -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. * 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_list args;
va_start(args, fmt); 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); va_end(args);
cleanup_exit(255); cleanup_exit(255);
} }

View File

@ -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>. * 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_list args;
va_start(args, fmt); 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); va_end(args);
cleanup_exit(255); cleanup_exit(255);
} }