fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-10 19:36:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #747 from pventuzelo/pventuzelo/724-fix-panics-execute-wasm

Browse Source 
[fix issue #724] replace panic! with return Err()
This commit is contained in:
Syrus Akbary 2019-09-03 10:42:47 -07:00 committed by GitHub
commit 80c1359c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/wasmer.rs
View File

@ -634,7 +634,9 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
if let Err(ref err) = result { if let Err(ref err) = result {
match err { match err {
RuntimeError::Trap { msg } => panic!("wasm trap occured: {}", msg), RuntimeError::Trap { msg } => {
return Err(format!("wasm trap occured: {}", msg))
}
#[cfg(feature = "wasi")] #[cfg(feature = "wasi")]
RuntimeError::Error { data } => { RuntimeError::Error { data } => {
if let Some(error_code) = data.downcast_ref::<wasmer_wasi::ExitCode>() { if let Some(error_code) = data.downcast_ref::<wasmer_wasi::ExitCode>() {
@ -644,7 +646,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
#[cfg(not(feature = "wasi"))] #[cfg(not(feature = "wasi"))]
RuntimeError::Error { .. } => (), RuntimeError::Error { .. } => (),
} }
panic!("error: {:?}", err) return Err(format!("error: {:?}", err));
} }
} }
} else { } else {