fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix argv allocation

Browse Source
This commit is contained in:
Steve Akinyemi 2018-12-06 16:20:02 +01:00
parent fcb19f1c98
commit 5b8e4ed4a6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/apis/emscripten/utils.rs
View File

@ -5,6 +5,7 @@ use libc::stat;
use std::ffi::{CStr, CString};
use std::os::raw::c_char;
use std::slice;
use std::mem::size_of;
/// We check if a provided module is an Emscripten generated one
pub fn is_emscripten_module(module: &Module) -> bool {
@ -29,7 +30,7 @@ pub unsafe fn copy_cstr_into_wasm(instance: &Instance, cstr: *const c_char) -> u
}
pub unsafe fn copy_cstr_array_into_wasm(array_count: u32, array: *mut *mut c_char, instance: &Instance) -> u32 {
let array_offset = (instance.emscripten_data.as_ref().unwrap().malloc)(array_count as _, instance);
let array_offset = (instance.emscripten_data.as_ref().unwrap().malloc)((array_count as usize * size_of::<u32>()) as _, instance);
let array_addr = instance.memory_offset_addr(0, array_offset as _) as *mut u32;
for i in 0..array_count {

2
src/webassembly/instance.rs
View File

@ -265,7 +265,7 @@ impl Instance {
func
// unimplemented!()
}).collect();
if let Some(ref progress_bar) = progress_bar_option {
progress_bar.set_style(ProgressStyle::default_bar()
.template(&format!("{} {{msg}}", style("[{elapsed_precise}]").bold().dim())));