avm2: Add make_error_1019 function and use it

Also fix the error message differing from avmplus in some cases

Author: Lord-McSweeney

core/src/avm2/error.rs

@@ -316,6 +316,25 @@ pub fn make_error_1014<'gc>(
     }
 }
 
+#[inline(never)]
+#[cold]
+pub fn make_error_1019<'gc>(
+    activation: &mut Activation<'_, 'gc>,
+    index: Option<usize>,
+) -> Error<'gc> {
+    let message = if let Some(index) = index {
+        format!("Error #1019: Getscopeobject {index} is out of bounds.")
+    } else {
+        "Error #1019: Getscopeobject  is out of bounds.".to_string()
+    };
+
+    let err = verify_error(activation, &message, 1019);
+    match err {
+        Ok(err) => Error::avm_error(err),
+        Err(err) => err,
+    }
+}
+
 #[inline(never)]
 #[cold]
 pub fn make_error_1021<'gc>(activation: &mut Activation<'_, 'gc>) -> Error<'gc> {

core/src/avm2/optimizer/type_aware.rs

@@ -1,5 +1,6 @@
 use crate::avm2::error::{
-    make_error_1026, make_error_1035, make_error_1051, make_error_1058, verify_error,
+    make_error_1019, make_error_1026, make_error_1035, make_error_1051, make_error_1058,
+    verify_error,
 };
 use crate::avm2::method::{Method, MethodAssociation, MethodKind, ResolvedParamConfig};
 use crate::avm2::multiname::Multiname;
@@ -1230,11 +1231,7 @@ fn abstract_interpret_ops<'gc>(
             }
             Op::GetScopeObject { index } => {
                 if index >= scope_stack.len() {
-                    return Err(Error::avm_error(verify_error(
-                        activation,
-                        "Error #1019: Getscopeobject  is out of bounds.",
-                        1019,
-                    )?));
+                    return Err(make_error_1019(activation, Some(index)));
                 }
 
                 stack.push(activation, scope_stack.at(index).0)?;
@@ -1977,11 +1974,7 @@ fn abstract_interpret_ops<'gc>(
             Op::SetGlobalSlot { .. } => {
                 let outer_scope = activation.outer();
                 if outer_scope.is_empty() && scope_stack.is_empty() {
-                    return Err(Error::avm_error(verify_error(
-                        activation,
-                        "Error #1019: Getscopeobject  is out of bounds.",
-                        1019,
-                    )?));
+                    return Err(make_error_1019(activation, Some(0)));
                 }
 
                 stack.pop(activation)?;

core/src/avm2/verify.rs

@@ -1,7 +1,7 @@
 use crate::avm2::class::Class;
 use crate::avm2::error::{
-    make_error_1014, make_error_1021, make_error_1025, make_error_1032, make_error_1054,
-    make_error_1107, verify_error, Error1014Type,
+    make_error_1014, make_error_1019, make_error_1021, make_error_1025, make_error_1032,
+    make_error_1054, make_error_1107, verify_error, Error1014Type,
 };
 use crate::avm2::method::Method;
 use crate::avm2::multiname::Multiname;
@@ -797,11 +797,7 @@ fn translate_op<'gc>(
 
         AbcOp::GetOuterScope { index } => {
             if activation.outer().get(index as usize).is_none() {
-                return Err(Error::avm_error(verify_error(
-                    activation,
-                    "Error #1019: Getscopeobject  is out of bounds.",
-                    1019,
-                )?));
+                return Err(make_error_1019(activation, None));
             }
         }