Bring back Module::deserialize (#2858)
* Bring back `Module::deserialize` I thought I was being clever suggesting that `Module::deserialize` was removed from #2791 by funneling all module constructors into `Module::new`. As our studious fuzzers have found, though, this means that `Module::new` is not safe currently to pass arbitrary user-defined input into. Now one might pretty reasonable expect to be able to do that, however, being a WebAssembly engine and all. This PR as a result separates the `deserialize` part of `Module::new` back into `Module::deserialize`. This means that binary blobs created with `Module::serialize` and `Engine::precompile_module` will need to be passed to `Module::deserialize` to "rehydrate" them back into a `Module`. This restores the property that it should be safe to pass arbitrary input to `Module::new` since it's always expected to be a wasm module. This also means that fuzzing will no longer attempt to fuzz `Module::deserialize` which isn't something we want to do anyway. * Fix an example * Mark `Module::deserialize` as `unsafe`
This commit is contained in:
@@ -6,8 +6,8 @@ fn serialize(engine: &Engine, wat: &'static str) -> Result<Vec<u8>> {
|
||||
Ok(module.serialize()?)
|
||||
}
|
||||
|
||||
fn deserialize_and_instantiate(store: &Store, buffer: &[u8]) -> Result<Instance> {
|
||||
let module = Module::new(store.engine(), buffer)?;
|
||||
unsafe fn deserialize_and_instantiate(store: &Store, buffer: &[u8]) -> Result<Instance> {
|
||||
let module = Module::deserialize(store.engine(), buffer)?;
|
||||
Ok(Instance::new(&store, &module, &[])?)
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ fn test_version_mismatch() -> Result<()> {
|
||||
let mut buffer = serialize(&engine, "(module)")?;
|
||||
buffer[13 /* header length */ + 1 /* version length */] = 'x' as u8;
|
||||
|
||||
match Module::new(&engine, &buffer) {
|
||||
match unsafe { Module::deserialize(&engine, &buffer) } {
|
||||
Ok(_) => bail!("expected deserialization to fail"),
|
||||
Err(e) => assert!(e
|
||||
.to_string()
|
||||
@@ -35,7 +35,7 @@ fn test_module_serialize_simple() -> Result<()> {
|
||||
)?;
|
||||
|
||||
let store = Store::default();
|
||||
let instance = deserialize_and_instantiate(&store, &buffer)?;
|
||||
let instance = unsafe { deserialize_and_instantiate(&store, &buffer)? };
|
||||
let run = instance.get_typed_func::<(), i32>("run")?;
|
||||
let result = run.call(())?;
|
||||
|
||||
@@ -53,7 +53,7 @@ fn test_module_serialize_fail() -> Result<()> {
|
||||
let mut config = Config::new();
|
||||
config.cranelift_opt_level(OptLevel::None);
|
||||
let store = Store::new(&Engine::new(&config)?);
|
||||
match deserialize_and_instantiate(&store, &buffer) {
|
||||
match unsafe { deserialize_and_instantiate(&store, &buffer) } {
|
||||
Ok(_) => bail!("expected failure at deserialization"),
|
||||
Err(_) => (),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user