tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: don't dereference NULL pointer when hashing jumphost 

OpenBSD-Commit-ID: 251c0263e1759a921341c7efe7f1d4c73e1c70f4
This commit is contained in:
djm@openbsd.org 2023-10-12 02:48:43 +00:00 committed by Damien Miller
parent 281c79168e
commit f59a94e22e
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh.c
View File

@ -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 <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1389,8 +1389,6 @@ main(int ac, char **av)
(unsigned long long)pw->pw_uid); (unsigned long long)pw->pw_uid);
cinfo->keyalias = xstrdup(options.host_key_alias ? cinfo->keyalias = xstrdup(options.host_key_alias ?
options.host_key_alias : options.host_arg); 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->host_arg = xstrdup(options.host_arg);
cinfo->remhost = xstrdup(host); cinfo->remhost = xstrdup(host);
cinfo->remuser = xstrdup(options.user); cinfo->remuser = xstrdup(options.user);
@ -1398,6 +1396,8 @@ main(int ac, char **av)
cinfo->locuser = xstrdup(pw->pw_name); cinfo->locuser = xstrdup(pw->pw_name);
cinfo->jmphost = xstrdup(options.jump_host == NULL ? cinfo->jmphost = xstrdup(options.jump_host == NULL ?
"" : options.jump_host); "" : 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, * Expand tokens in arguments. NB. LocalCommand is expanded later,