Do not run Wasm with 0 imports as WASI in the CLI

wasmerio · May 4, 2021 · 5d41f99 · 5d41f99
1 parent f2dd752
commit 5d41f99
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 32 deletions.
diff --git a/lib/cli/src/commands/run.rs b/lib/cli/src/commands/run.rs
@@ -156,37 +156,41 @@ impl Run {
             use wasmer_wasi::WasiVersion;
 
             let wasi_versions = Wasi::get_versions(&module);
-            if let Some(wasi_versions) = wasi_versions {
-                if wasi_versions.len() >= 2 {
-                    let get_version_list = |versions: &BTreeSet<WasiVersion>| -> String {
-                        versions
-                            .iter()
-                            .map(|v| format!("`{}`", v.get_namespace_str()))
-                            .collect::<Vec<String>>()
-                            .join(", ")
-                    };
-                    if self.wasi.deny_multiple_wasi_versions {
-                        let version_list = get_version_list(&wasi_versions);
-                        bail!("Found more than 1 WASI version in this module ({}) and `--deny-multiple-wasi-versions` is enabled.", version_list);
-                    } else if !self.wasi.allow_multiple_wasi_versions {
-                        let version_list = get_version_list(&wasi_versions);
-                        warning!("Found more than 1 WASI version in this module ({}). If this is intentional, pass `--allow-multiple-wasi-versions` to suppress this warning.", version_list);
+            match wasi_versions {
+                Some(wasi_versions) if !wasi_versions.is_empty() => {
+                    if wasi_versions.len() >= 2 {
+                        let get_version_list = |versions: &BTreeSet<WasiVersion>| -> String {
+                            versions
+                                .iter()
+                                .map(|v| format!("`{}`", v.get_namespace_str()))
+                                .collect::<Vec<String>>()
+                                .join(", ")
+                        };
+                        if self.wasi.deny_multiple_wasi_versions {
+                            let version_list = get_version_list(&wasi_versions);
+                            bail!("Found more than 1 WASI version in this module ({}) and `--deny-multiple-wasi-versions` is enabled.", version_list);
+                        } else if !self.wasi.allow_multiple_wasi_versions {
+                            let version_list = get_version_list(&wasi_versions);
+                            warning!("Found more than 1 WASI version in this module ({}). If this is intentional, pass `--allow-multiple-wasi-versions` to suppress this warning.", version_list);
+                        }
                     }
-                }
 
-                let program_name = self
-                    .command_name
-                    .clone()
-                    .or_else(|| {
-                        self.path
-                            .file_name()
-                            .map(|f| f.to_string_lossy().to_string())
-                    })
-                    .unwrap_or_default();
-                return self
-                    .wasi
-                    .execute(module, program_name, self.args.clone())
-                    .with_context(|| "WASI execution failed");
+                    let program_name = self
+                        .command_name
+                        .clone()
+                        .or_else(|| {
+                            self.path
+                                .file_name()
+                                .map(|f| f.to_string_lossy().to_string())
+                        })
+                        .unwrap_or_default();
+                    return self
+                        .wasi
+                        .execute(module, program_name, self.args.clone())
+                        .with_context(|| "WASI execution failed");
+                }
+                // not WASI
+                _ => (),
             }
         }
 

diff --git a/tests/integration/cli/tests/run.rs b/tests/integration/cli/tests/run.rs
@@ -8,7 +8,7 @@ fn wasi_test_wasm_path() -> String {
     format!("{}/{}", C_ASSET_PATH, "qjs.wasm")
 }
 
-fn wasi_test_empty_wat_path() -> String {
+fn test_no_imports_wat_path() -> String {
     format!("{}/{}", ASSET_PATH, "fib.wat")
 }
 
@@ -39,10 +39,10 @@ fn run_wasi_works() -> anyhow::Result<()> {
 }
 
 #[test]
-fn run_empty_wasi_works() -> anyhow::Result<()> {
+fn run_no_imports_wasm_works() -> anyhow::Result<()> {
     let output = Command::new(WASMER_PATH)
         .arg("run")
-        .arg(wasi_test_empty_wat_path())
+        .arg(test_no_imports_wat_path())
         .output()?;
 
     if !output.status.success() {