summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-05-27 21:25:18 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-05-28 10:25:18 +1000
commit16ea1fdbe736648f79a827219134331f8d9844fb (patch)
tree22a73e43c9a2f6d6c779e44977db3394a2c56cc2 /readconf.c
parent47adfdc07f4f8ea0064a1495500244de08d311ed (diff)
upstream: fix crash in recallocarray when deleting SendEnv
variables; spotted by & ok sthen@ OpenBSD-Commit-ID: b881e8e849edeec5082b5c0a87d8d7cff091a8fd
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 2afcbaec..63ed7fd5 100644
--- a/readconf.c
+++ b/readconf.c
@@ -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>
* 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
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;
/* Remove an environment variable */
@@ -758,6 +758,11 @@ rm_env(Options *options, const char *arg, const char *filename, int linenum)
options->num_send_env--;
/* 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));
+ }
}
/*