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

upstream: Avoid an unnecessary xstrdup in rm_env() when matching

Browse Source 
patterns. Since match_pattern() doesn't modify its arguments (they are
const), there is no need to make an extra copy of the strings in
options->send_env. From Martin Vahlensieck

OpenBSD-Commit-ID: 2c9db31e3f4d3403b49642c64ee048b2a0a39351
This commit is contained in:
millert@openbsd.org 2022-04-20 15:56:49 +00:00 committed by Darren Tucker
parent 7bf2eb958f
commit fe9d87a680
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.366 2022/02/08 08:59:12 dtucker Exp $ */ /* $OpenBSD: readconf.c,v 1.367 2022/04/20 15:56:49 millert 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
@ -754,19 +754,15 @@ static void
rm_env(Options *options, const char *arg, const char *filename, int linenum) rm_env(Options *options, const char *arg, const char *filename, int linenum)
{ {
int i, j, onum_send_env = options->num_send_env; int i, j, onum_send_env = options->num_send_env;
char *cp;
/* Remove an environment variable */ /* Remove an environment variable */
for (i = 0; i < options->num_send_env; ) { for (i = 0; i < options->num_send_env; ) {
cp = xstrdup(options->send_env[i]); if (!match_pattern(options->send_env[i], arg + 1)) {
if (!match_pattern(cp, arg + 1)) {
free(cp);
i++; i++;
continue; continue;
} }
debug3("%s line %d: removing environment %s", debug3("%s line %d: removing environment %s",
filename, linenum, cp); filename, linenum, options->send_env[i]);
free(cp);
free(options->send_env[i]); free(options->send_env[i]);
options->send_env[i] = NULL; options->send_env[i] = NULL;
for (j = i; j < options->num_send_env - 1; j++) { for (j = i; j < options->num_send_env - 1; j++) {