remove redundant ssh!=NULL check; we'd already dereferenced it
authordjm <djm@openbsd.org>
Thu, 6 Apr 2023 03:21:31 +0000 (03:21 +0000)
committerdjm <djm@openbsd.org>
Thu, 6 Apr 2023 03:21:31 +0000 (03:21 +0000)
usr.bin/ssh/packet.c

index a71820f..b9a5343 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.309 2023/03/03 10:23:42 dtucker Exp $ */
+/* $OpenBSD: packet.c,v 1.310 2023/04/06 03:21:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1869,7 +1869,7 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap)
        case SSH_ERR_NO_COMPRESS_ALG_MATCH:
        case SSH_ERR_NO_KEX_ALG_MATCH:
        case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
-               if (ssh && ssh->kex && ssh->kex->failed_choice) {
+               if (ssh->kex && ssh->kex->failed_choice) {
                        ssh_packet_clear_keys(ssh);
                        errno = oerrno;
                        logdie("Unable to negotiate with %s: %s. "