From: dtucker <dtucker@openbsd.org>
Date: Sat, 18 Jun 2022 02:17:16 +0000 (+0000)
Subject: Don't attempt to fprintf a null identity comment.  From Martin Vahlensieck
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0c10332af909747af443c5d5791f0995fa850470;p=openbsd

Don't attempt to fprintf a null identity comment.  From Martin Vahlensieck
via tech@.
---

diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index c206118a320..03afd1d1df5 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.165 2022/02/04 02:49:17 dtucker Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.166 2022/06/18 02:17:16 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -118,7 +118,7 @@ delete_one(int agent_fd, const struct sshkey *key, const char *comment,
 	}
 	if (!qflag) {
 		fprintf(stderr, "Identity removed: %s %s (%s)\n", path,
-		    sshkey_type(key), comment);
+		    sshkey_type(key), comment ? comment : "no comment");
 	}
 	return 0;
 }
@@ -392,7 +392,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
 		    certpath, filename);
 		sshkey_free(cert);
 		goto out;
-	} 
+	}
 
 	/* Graft with private bits */
 	if ((r = sshkey_to_certified(private)) != 0) {