fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-15 09:51:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix emscripten table assertion panic

Browse Source
This commit is contained in:
Brandon Fish
2019-08-16 09:12:46 -06:00
parent 6e8baf3c89
commit 03cabce2d5
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/emscripten/src/lib.rs
View File

@ -436,7 +436,7 @@ pub struct EmscriptenGlobals {
}
impl EmscriptenGlobals {
pub fn new(module: &Module /*, static_bump: u32 */) -> Self {
pub fn new(module: &Module /*, static_bump: u32 */) -> Result<Self, String> {
let mut use_old_abort_on_cannot_grow_memory = false;
for (
index,
@ -458,7 +458,7 @@ impl EmscriptenGlobals {
}
}
let (table_min, table_max) = get_emscripten_table_size(&module);
let (table_min, table_max) = get_emscripten_table_size(&module)?;
let (memory_min, memory_max, shared) = get_emscripten_memory_size(&module);
// Memory initialization
@ -530,14 +530,14 @@ impl EmscriptenGlobals {
}
}
Self {
Ok(Self {
data,
memory,
table,
memory_min,
memory_max,
null_func_names,
}
})
}
}