upstream commit

don't printf NULL key comments; reported by Tom Christensen

1 files changed, 3 insertions, 2 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4a5c40284..a3c2362a2 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.265 2015/02/24 15:24:05 naddy Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.266 2015/02/26 20:45:47 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1276,7 +1276,8 @@ do_change_passphrase(struct passwd *pw)
                     identity_file, ssh_err(r));
                 exit(1);
         }
-        printf("Key has comment '%s'\n", comment);
+        if (comment)
+                printf("Key has comment '%s'\n", comment);
 
         /* Ask the new passphrase (twice). */
         if (identity_new_passphrase) {