From bd82563bb62ebf1bca006ad09276217cbd167da6 Mon Sep 17 00:00:00 2001 From: nosamu <71368227+n0samu@users.noreply.github.com> Date: Fri, 18 Aug 2023 05:46:52 -0500 Subject: [PATCH] avm2: More lenient SWF version check for invalid frame label behavior Fixes #11987 --- core/src/avm2/globals/flash/display/movie_clip.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/avm2/globals/flash/display/movie_clip.rs b/core/src/avm2/globals/flash/display/movie_clip.rs index 766821d53..de9b9dfa5 100644 --- a/core/src/avm2/globals/flash/display/movie_clip.rs +++ b/core/src/avm2/globals/flash/display/movie_clip.rs @@ -392,7 +392,8 @@ pub fn goto_frame<'gc>( } let frame = mc.frame_label_to_number(&frame_or_label, &activation.context); - if mc.movie().version() >= 11 { + // TODO: This should use the SWF version of the current DoAbc(2) tag. Until then, let's be lenient + if mc.movie().version() >= 11 && activation.context.swf.version() >= 11 { frame.ok_or( // TODO: Also include the scene in the error message, as done above Error::AvmError(argument_error(