From: djm <djm@openbsd.org>
Date: Thu, 6 Apr 2023 03:21:31 +0000 (+0000)
Subject: remove redundant ssh!=NULL check; we'd already dereferenced it
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6127d4ae32d09c467d6ae2f893f8ff8971f78276;p=openbsd

remove redundant ssh!=NULL check; we'd already dereferenced it
---

diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index a71820f8faa..b9a5343bf7b 100644
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -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. "