xeos
/
wasmi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Propagate error if frame stack overflown on create

This commit is contained in:
Sergey Pepyakin 2019-04-18 17:53:12 +02:00
parent 2a058136b9
commit 843a40d888
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
validation/src/func.rs
View File

@ -104,7 +104,7 @@ pub fn drive<T: FuncValidator>(
DEFAULT_VALUE_STACK_LIMIT, DEFAULT_VALUE_STACK_LIMIT,
DEFAULT_FRAME_STACK_LIMIT, DEFAULT_FRAME_STACK_LIMIT,
result_ty, result_ty,
); )?;
let mut validator = T::new(&context, body); let mut validator = T::new(&context, body);
@ -148,7 +148,7 @@ impl<'a> FunctionValidationContext<'a> {
value_stack_limit: usize, value_stack_limit: usize,
frame_stack_limit: usize, frame_stack_limit: usize,
return_type: BlockType, return_type: BlockType,
) -> Self { ) -> Result<Self, Error> {
let mut ctx = FunctionValidationContext { let mut ctx = FunctionValidationContext {
module: module, module: module,
locals: locals, locals: locals,
@ -156,16 +156,13 @@ impl<'a> FunctionValidationContext<'a> {
frame_stack: StackWithLimit::with_limit(frame_stack_limit), frame_stack: StackWithLimit::with_limit(frame_stack_limit),
return_type: return_type, return_type: return_type,
}; };
// push_label overflows only if the frame stack overflow happens. We assume that push_label(
// the limit is greater than 0 here. We don't expect `push_label` getting any other
// new errors.
let _ = push_label(
StartedWith::Block, StartedWith::Block,
return_type, return_type,
&ctx.value_stack, &ctx.value_stack,
&mut ctx.frame_stack, &mut ctx.frame_stack,
); )?;
ctx Ok(ctx)
} }
pub fn step(&mut self, instruction: &Instruction) -> Result<(), Error> { pub fn step(&mut self, instruction: &Instruction) -> Result<(), Error> {