tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: check result of strchr() against NULL rather than

Browse Source 
searched-for characters; from zhongjubin@huawei.com

OpenBSD-Commit-ID: e6f57de1d4a4d25f8db2d44e8d58d847e247a4fe
This commit is contained in:
djm@openbsd.org 2020-11-28 03:27:59 +00:00 committed by Darren Tucker
parent 57bf03f021
commit 022def7bd1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.325 2020/10/18 11:32:02 djm Exp $ */ /* $OpenBSD: session.c,v 1.326 2020/11/28 03:27:59 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1105,7 +1105,7 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
for (n = 0 ; n < auth_opts->nenv; n++) { for (n = 0 ; n < auth_opts->nenv; n++) {
ocp = xstrdup(auth_opts->env[n]); ocp = xstrdup(auth_opts->env[n]);
cp = strchr(ocp, '='); cp = strchr(ocp, '=');
if (*cp == '=') { if (cp != NULL) {
*cp = '\0'; *cp = '\0';
/* Apply PermitUserEnvironment allowlist */ /* Apply PermitUserEnvironment allowlist */
if (options.permit_user_env_allowlist == NULL || if (options.permit_user_env_allowlist == NULL ||