Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Don't use `std::env::vars` for inheriting env vars (#14017)

Alex Crichton790bc4928077
diff --git a/src/common.rs b/src/common.rs
index d1d81b8642..a48ae9eb94 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -323,7 +323,13 @@ impl RunCommon {
builder.allow_blocking_current_thread(self.common.wasm.timeout.is_none());
if self.common.wasi.inherit_env == Some(true) {
- for (k, v) in std::env::vars() {
+ for (k, v) in std::env::vars_os() {
+ let k = k.to_str().ok_or_else(|| {
+ format_err!("environment variable name {k:?} not valid utf-8")
+ })?;
+ let v = v.to_str().ok_or_else(|| {
+ format_err!("environment variable {k:?} value {v:?} not valid utf-8")
+ })?;
builder.env(&k, &v);
}
}
diff --git a/tests/all/cli_tests.rs b/tests/all/cli_tests.rs
index 95d08ca435..fa3fee6c74 100644
--- a/tests/all/cli_tests.rs
+++ b/tests/all/cli_tests.rs
@@ -3590,3 +3590,64 @@ fn hot_blocks_fib() -> Result<()> {
Ok(())
}
+
+#[test]
+#[cfg(unix)]
+fn non_utf8_raises_error() -> Result<()> {
+ use std::ffi::{OsStr, OsString};
+ use std::os::unix::prelude::*;
+
+ let invalid_utf8 = OsStr::from_bytes(b"\xFF");
+
+ // If everything is valid this should succeed...
+ {
+ let mut cmd = get_wasmtime_command()?;
+ cmd.arg("-Sinherit-env")
+ .arg("tests/all/cli_tests/simple.wat");
+ let output = cmd.output()?;
+ assert!(output.status.success());
+ }
+
+ // -Sinherit-env
+ {
+ let mut cmd = get_wasmtime_command()?;
+ cmd.arg("-Sinherit-env")
+ .arg("tests/all/cli_tests/simple.wat");
+ cmd.env("HI", invalid_utf8);
+ let output = cmd.output()?;
+ if output.status.success() {
+ bail!("should have failed: {output:?}")
+ }
+ }
+ // --env=HI
+ {
+ let mut cmd = get_wasmtime_command()?;
+ cmd.arg("--env=HI").arg("tests/all/cli_tests/simple.wat");
+ cmd.env("HI", invalid_utf8);
+ let output = cmd.output()?;
+ if output.status.success() {
+ bail!("should have failed: {output:?}")
+ }
+ }
+ // --env=HI=$bad
+ {
+ let mut cmd = get_wasmtime_command()?;
+ let mut bad = OsString::from("--env=HI=");
+ bad.push(invalid_utf8);
+ cmd.arg(&bad).arg("tests/all/cli_tests/simple.wat");
+ let output = cmd.output()?;
+ if output.status.success() {
+ bail!("should have failed: {output:?}")
+ }
+ }
+ // $bad (bare argument)
+ {
+ let mut cmd = get_wasmtime_command()?;
+ cmd.arg("tests/all/cli_tests/simple.wat").arg(invalid_utf8);
+ let output = cmd.output()?;
+ if output.status.success() {
+ bail!("should have failed: {output:?}")
+ }
+ }
+ Ok(())
+}