mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-09 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed assumption about wat.

Browse Source
This commit is contained in:
Syrus
2020-04-30 18:02:44 -07:00
parent 4d7d20ce1a
commit 91fb0fa70a
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/api/src/module.rs
View File

@@ -67,28 +67,18 @@ impl Module {
/// let module = Module::new(&store, bytes)?; /// let module = Module::new(&store, bytes)?;
/// ``` /// ```
pub fn new(store: &Store, bytes: impl AsRef<[u8]>) -> Result<Module, CompileError> { pub fn new(store: &Store, bytes: impl AsRef<[u8]>) -> Result<Module, CompileError> {
// We try to parse it with WAT: it will be a no-op on #[cfg(feature = "wat")]
// wasm files. {
if bytes.as_ref().starts_with(b"\0asm") { let bytes = wat::parse_bytes(bytes.as_ref()).map_err(|e| {
CompileError::Wasm(WasmError::Generic(format!(
"Error when converting wat: {}",
e
)))
})?;
return Module::from_binary(store, bytes.as_ref()); return Module::from_binary(store, bytes.as_ref());
} }
#[cfg(feature = "wat")] Module::from_binary(store, bytes.as_ref())
{
let bytes = wat::parse_bytes(bytes.as_ref())
.map_err(|e| CompileError::Wasm(WasmError::Generic(format!("{}", e))))?;
// We can assume the binary is valid WebAssembly if returned
// without errors from from wat. However, by skipping validation
// we are not checking if it's using WebAssembly features not enabled
// in the store.
// This is a good tradeoff, as we can assume the "wat" feature is only
// going to be used in development mode.
return unsafe { Module::from_binary_unchecked(store, bytes.as_ref()) };
}
Err(CompileError::Validate(
"The module is not a valid WebAssembly file.".to_string(),
))
} }
pub fn from_file(store: &Store, file: impl AsRef<Path>) -> Result<Module, IoCompileError> { pub fn from_file(store: &Store, file: impl AsRef<Path>) -> Result<Module, IoCompileError> {