liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly unwind errors thrown from the AVM2 reader.

This commit is contained in:
David Wendt 2020-03-05 21:12:54 -05:00
parent 1cc8954747
commit 73189b6449
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/avm2.rs
View File

@ -423,7 +423,8 @@ impl<'gc> Avm2<'gc> {
context: &mut UpdateContext<'_, 'gc, '_>, context: &mut UpdateContext<'_, 'gc, '_>,
reader: &mut Reader<Cursor<&[u8]>>, reader: &mut Reader<Cursor<&[u8]>>,
) -> Result<(), Error> { ) -> Result<(), Error> {
if let Some(op) = reader.read_op()? { let op = reader.read_op();
if let Ok(Some(op)) = op {
avm_debug!("Opcode: {:?}", op); avm_debug!("Opcode: {:?}", op);
let result = match op { let result = match op {
@ -511,6 +512,14 @@ impl<'gc> Avm2<'gc> {
self.unwind_stack_frame(); self.unwind_stack_frame();
return result; return result;
} }
} else if let Ok(None) = op {
log::error!("Unknown opcode!");
self.unwind_stack_frame();
return Err("Unknown opcode!".into());
} else if let Err(e) = op {
log::error!("Parse error: {:?}", e);
self.unwind_stack_frame();
return Err(e.into());
} }
Ok(()) Ok(())