From a2d56016cb9bf9e59439a605cbe48c8216f5f056 Mon Sep 17 00:00:00 2001 From: David Wendt Date: Thu, 4 Feb 2021 19:53:50 -0500 Subject: [PATCH] avm2: Don't except when dispatching events on unconstructed objects. --- core/src/avm2/events.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/avm2/events.rs b/core/src/avm2/events.rs index 9604f4402..db8d6aff7 100644 --- a/core/src/avm2/events.rs +++ b/core/src/avm2/events.rs @@ -381,7 +381,14 @@ pub fn dispatch_event_to_target<'gc>( &QName::new(Namespace::private(NS_EVENT_DISPATCHER), "dispatch_list"), activation, )? - .coerce_to_object(activation)?; + .coerce_to_object(activation); + + if dispatch_list.is_err() { + // Objects with no dispatch list act as if they had an empty one + return Ok(()); + } + + let dispatch_list = dispatch_list.unwrap(); let mut evtmut = event.as_event_mut(activation.context.gc_context).unwrap(); let name = evtmut.event_type();