upstream: avoid NULL deref in -Y find-principals. Report and fix

from Carlo Marcelo Arenas Belón
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenBSD-Commit-ID: 6238486f8ecc888d6ccafcd9ad99e621bb41f1e0

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 18e9f1d180c6a8ae35319d48271f0eb447607b55..cf5d95af7a6cebf0457168b61628c8c5398243f7 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.435 2021/08/11 08:54:17 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.436 2021/09/07 06:03:51 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2680,7 +2680,8 @@ sig_process_opts(char * const *opts, size_t nopts, uint64_t *verify_timep,
        time_t now;
 
        *verify_timep = 0;
-       *print_pubkey = 0;
+       if (print_pubkey == NULL)
+               *print_pubkey = 0;
        for (i = 0; i < nopts; i++) {
                if (strncasecmp(opts[i], "verify-time=", 12) == 0) {
                        if (parse_absolute_time(opts[i] + 12,