From ceec2b3cebab9072beccd65c678b5bc51f830b5d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 5 Mar 2022 11:13:32 -0500
Subject: [PATCH] avoid env var forwarding logic panicking for non-UTF-8 env
 vars

---
 src/shims/env.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shims/env.rs b/src/shims/env.rs
index 59fd16912a22..dfd1ef207d96 100644
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -50,10 +50,10 @@ impl<'tcx> EnvVars<'tcx> {
 
         // Skip the loop entirely if we don't want to forward anything.
         if ecx.machine.communicate() || !forwarded_env_vars.is_empty() {
-            for (name, value) in env::vars() {
+            for (name, value) in env::vars_os() {
                 let forward = match ecx.machine.communicate() {
-                    true => !excluded_env_vars.contains(&name),
-                    false => forwarded_env_vars.contains(&name),
+                    true => !excluded_env_vars.iter().any(|v| v.as_str() == &name),
+                    false => forwarded_env_vars.iter().any(|v| v.as_str() == &name),
                 };
                 if forward {
                     let var_ptr = match target_os {