From 443a55199bc440d43e3c57220b0fbee217a1cf1c Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 12 Oct 2023 02:48:43 +0000 Subject: [PATCH] don't dereference NULL pointer when hashing jumphost --- usr.bin/ssh/ssh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index af215364d6c..8b0bd606085 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.597 2023/10/12 02:18:18 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.598 2023/10/12 02:48:43 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1368,8 +1368,6 @@ main(int ac, char **av) (unsigned long long)pw->pw_uid); cinfo->keyalias = xstrdup(options.host_key_alias ? options.host_key_alias : options.host_arg); - cinfo->conn_hash_hex = ssh_connection_hash(cinfo->thishost, host, - cinfo->portstr, options.user, options.jump_host); cinfo->host_arg = xstrdup(options.host_arg); cinfo->remhost = xstrdup(host); cinfo->remuser = xstrdup(options.user); @@ -1377,6 +1375,8 @@ main(int ac, char **av) cinfo->locuser = xstrdup(pw->pw_name); cinfo->jmphost = xstrdup(options.jump_host == NULL ? "" : options.jump_host); + cinfo->conn_hash_hex = ssh_connection_hash(cinfo->thishost, + cinfo->remhost, cinfo->portstr, cinfo->remuser, cinfo->jmphost); /* * Expand tokens in arguments. NB. LocalCommand is expanded later, -- 2.20.1