Merge branch 'obsd-master'

Conflicts:
	cmd-pipe-pane.c

1 files changed, 5 insertions, 2 deletions

diff --git a/environ.c b/environ.c
index 284f8b55..0dd91783 100644
--- a/environ.c
+++ b/environ.c
@@ -168,8 +168,11 @@ environ_push(struct environ *env)
 		var[strcspn(var, "=")] = '\0';
 		ARRAY_ADD(&varlist, var);
 	}
-	for (i = 0; i < ARRAY_LENGTH(&varlist); i++)
-		unsetenv(ARRAY_ITEM(&varlist, i));
+	for (i = 0; i < ARRAY_LENGTH(&varlist); i++) {
+		var = ARRAY_ITEM(&varlist, i);
+		unsetenv(var);
+		free(var);
+	}
 	ARRAY_FREE(&varlist);
 
 	RB_FOREACH(envent, environ, env) {