avm2: Prevent AVM1Movies from being moved around in the DO hierarchy

ruffle-rs · Nov 30, 2023 · 1ce3ec6 · 1ce3ec6
1 parent 889c13f
commit 1ce3ec6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/core/src/avm2/globals/flash/display/display_object_container.rs b/core/src/avm2/globals/flash/display/display_object_container.rs
@@ -50,6 +50,14 @@ fn validate_add_operation<'gc>(
         )?));
     }
 
+    if !proposed_child.movie().is_action_script_3() {
+        return Err(Error::AvmError(argument_error(
+            activation,
+            "Error #2180: It is illegal to move AVM1 content (AS1 or AS2) to a different part of the displayList when it has been loaded into AVM2 (AS3) content.",
+            2180,
+        )?));
+    }
+
     if DisplayObject::ptr_eq(proposed_child, new_parent) {
         return Err(Error::AvmError(argument_error(
             activation,

diff --git a/tests/tests/swfs/avm2/mixed_avm/output.txt b/tests/tests/swfs/avm2/mixed_avm/output.txt
@@ -3,4 +3,6 @@ hello from avm1!
 [object AVM1Movie]
 [object ApplicationDomain]
 Load complete!
+2180
+ArgumentError
 onmousedown at 10, 10!
diff --git a/tests/tests/swfs/avm2/mixed_avm/test.swf b/tests/tests/swfs/avm2/mixed_avm/test.swf