From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 25 Jul 2025 11:50:45 +0000 (+0000)
Subject: upstream: Don't snprintf a NULL since not all platforms support it.
X-Git-Tag: V_10_1_P1~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed1e370d84e9dc39bc31c19cca12222d991fdc6f;p=thirdparty%2Fopenssh-portable.git

upstream: Don't snprintf a NULL since not all platforms support it.

OpenBSD-Commit-ID: 6e0c268e40047e96fab6bc56dc340580b537183b
---

diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index a1bf85aa6..64b8f4c1c 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11-client.c,v 1.22 2025/07/24 23:27:04 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11-client.c,v 1.23 2025/07/25 11:50:45 dtucker Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -450,7 +450,7 @@ pkcs11_del_provider(char *name)
 	 * ssh-agent deletes keys before calling this, so the helper entry
 	 * should be gone before we get here.
 	 */
-	debug3_f("delete %s", name);
+	debug3_f("delete %s", name ? name : "(null)");
 	if ((helper = helper_by_provider(name)) != NULL)
 		helper_terminate(helper);
 	return 0;