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

Check param count.

Browse Source
This commit is contained in:
Heyang Zhou 2019-05-06 09:19:56 -07:00
parent b343fd40bc
commit 0895dc60c2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/kwasm-loader/src/lib.rs
View File

@ -74,6 +74,9 @@ impl Loader for KernelLoader {
::std::slice::from_raw_parts(ctx.dynamic_sigindices, full_ctx.dynamic_sigindice_count()) ::std::slice::from_raw_parts(ctx.dynamic_sigindices, full_ctx.dynamic_sigindice_count())
) )
}; };
let local_param_counts: Vec<usize> = (module.imported_functions.len()..module.func_assoc.len())
.map(|x| module.signatures.get(*module.func_assoc.get(FuncIndex::new(x)).unwrap()).unwrap().params().len())
.collect();
let profile = LoadProfile { let profile = LoadProfile {
code: code, code: code,
memory: memory, memory: memory,
@ -87,6 +90,7 @@ impl Loader for KernelLoader {
Ok(KernelInstance { Ok(KernelInstance {
context: sc, context: sc,
offsets: rm.get_offsets().unwrap(), offsets: rm.get_offsets().unwrap(),
param_counts: local_param_counts,
}) })
} }
} }
@ -94,11 +98,15 @@ impl Loader for KernelLoader {
pub struct KernelInstance { pub struct KernelInstance {
context: ServiceContext, context: ServiceContext,
offsets: Vec<usize>, offsets: Vec<usize>,
param_counts: Vec<usize>, // FIXME: Full signature check
} }
impl Instance for KernelInstance { impl Instance for KernelInstance {
type Error = String; type Error = String;
fn call(&mut self, id: usize, args: &[Value]) -> Result<u64, String> { fn call(&mut self, id: usize, args: &[Value]) -> Result<u64, String> {
if args.len() != self.param_counts[id] {
return Err("param count mismatch".into());
}
let args: Vec<u64> = args.iter().map(|x| x.to_u64()).collect(); let args: Vec<u64> = args.iter().map(|x| x.to_u64()).collect();
let ret = self.context.run_code(RunProfile { let ret = self.context.run_code(RunProfile {