diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2024-10-22 08:13:00 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2024-10-22 08:50:23 +0200 |
| commit | 87bd1cb3ccba5e91d2650eb7f753c898ee43858e (patch) | |
| tree | c36543241a0cfd53c5358911169febe2c3ea6fb0 | |
| parent | Resync cvsid missed in commit 6072e4c9. (diff) | |
| download | openssh-87bd1cb3ccba5e91d2650eb7f753c898ee43858e.tar.xz openssh-87bd1cb3ccba5e91d2650eb7f753c898ee43858e.zip | |
upstream: Make debug call printf("%s", NULL) safe.
Prevents problems on platforms where this isn't safe (which it's not
required to be). ok djm@
OpenBSD-Commit-ID: 8fa4ce3ad90915c925b81b99a79ab920b0523387
| -rw-r--r-- | monitor_wrap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index d6e488a13..bd900b2f0 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.137 2024/10/14 01:57:50 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.138 2024/10/22 06:13:00 dtucker Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -273,7 +273,8 @@ mm_sshkey_sign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp, if ((r = sshbuf_get_string(m, sigp, lenp)) != 0) fatal_fr(r, "parse"); sshbuf_free(m); - debug3_f("%s signature len=%zu", hostkey_alg, *lenp); + debug3_f("%s signature len=%zu", hostkey_alg ? hostkey_alg : "(null)", + *lenp); return (0); } |