From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 16 Jan 2017 18:12:56 +0000 (-0700)
Subject: In sudo_unsetenv_nodebug(), decrement envp.env_len after removing
X-Git-Tag: SUDO_1_8_20^2~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=deb4c3b19c6d39598569fce89ea7b5adc4618160;p=sudo

In sudo_unsetenv_nodebug(), decrement envp.env_len after removing
the variable.  From Paul Zirnik of SUSE.
---

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index 8ba353b44..04b3749a3 100644
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -497,6 +497,7 @@ sudo_unsetenv_nodebug(const char *var)
 	    char **cur = ep;
 	    while ((*cur = *(cur + 1)) != NULL)
 		cur++;
+	    env.env_len--;
 	    /* Keep going, could be multiple instances of the var. */
 	} else {
 	    ep++;