diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-07-24 01:55:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-07-24 12:30:58 +1000 |
| commit | 7d64a9fb587ba9592f027f7a2264226c713d6579 (patch) | |
| tree | 8ab5b414cfb603c4181ef251e8cab8ef0101d14b /auth-options.c | |
| parent | db2130e2340bf923e41c791aa9cd27b9e926042c (diff) | |
| download | openssh-git-7d64a9fb587ba9592f027f7a2264226c713d6579.tar.gz | |
upstream: don't leak environment= variable when it is not the first
match
OpenBSD-Commit-ID: 7fbdc3dfe0032deaf003fd937eeb4d434ee4efe0
Diffstat (limited to 'auth-options.c')
| -rw-r--r-- | auth-options.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c index aa5da78a..335f0323 100644 --- a/auth-options.c +++ b/auth-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.96 2021/07/23 03:57:20 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.97 2021/07/24 01:55:19 djm Exp $ */ /* * Copyright (c) 2018 Damien Miller <djm@mindrot.org> * @@ -410,8 +410,10 @@ sshauthopt_parse(const char *opts, const char **errstrp) errstr = "invalid environment string"; goto fail; } - if ((cp = strdup(opt)) == NULL) + if ((cp = strdup(opt)) == NULL) { + free(opt); goto alloc_fail; + } l = (size_t)(tmp - opt); cp[l] = '\0'; /* truncate at '=' */ if (!valid_env_name(cp)) { @@ -440,7 +442,9 @@ sshauthopt_parse(const char *opts, const char **errstrp) goto alloc_fail; } ret->env[ret->nenv++] = opt; + opt = NULL; /* transferred */ } + free(opt); } else if (opt_match(&opts, "permitopen")) { if (handle_permit(&opts, 0, &ret->permitopen, &ret->npermitopen, &errstr) != 0) |