diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-04-06 05:21:31 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-04-06 05:27:17 +0200 |
| commit | 3a7b110fbc7e096423f8f7b459deffe4c65d70f4 (patch) | |
| tree | a6ecef739727dc5110e0597e1db1e1ff23d782a5 /packet.c | |
| parent | upstream: match_user() shouldn't be called with user==NULL unless (diff) | |
| download | openssh-3a7b110fbc7e096423f8f7b459deffe4c65d70f4.tar.xz openssh-3a7b110fbc7e096423f8f7b459deffe4c65d70f4.zip | |
upstream: remove redundant ssh!=NULL check; we'd already
dereferenced it
OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 @@ -1890,7 +1890,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. " |