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: fix crash in recallocarray when deleting SendEnv 

variables; spotted by & ok sthen@

OpenBSD-Commit-ID: b881e8e849edeec5082b5c0a87d8d7cff091a8fd
This commit is contained in:
djm@openbsd.org 2020-05-27 21:25:18 +00:00 committed by Darren Tucker
parent 47adfdc07f
commit 16ea1fdbe7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.329 2020/04/24 03:33:21 dtucker Exp $ */ /* $OpenBSD: readconf.c,v 1.330 2020/05/27 21:25:18 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
@ -735,7 +735,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
static void 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; int i, j, onum_send_env = options->num_send_env;
char *cp; char *cp;
/* Remove an environment variable */ /* Remove an environment variable */
@ -758,6 +758,11 @@ rm_env(Options *options, const char *arg, const char *filename, int linenum)
options->num_send_env--; options->num_send_env--;
/* NB. don't increment i */ /* NB. don't increment i */
} }
if (onum_send_env != options->num_send_env) {
options->send_env = xrecallocarray(options->send_env,
onum_send_env, options->num_send_env,
sizeof(*options->send_env));
}
} }
/* /*