fix sqvm function crashes

R2NorthstarTools · Mar 19, 2024 · c031667 · c031667
1 parent b9c2d35
commit c031667
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/high/engine_sync.rs b/src/high/engine_sync.rs
@@ -127,12 +127,12 @@ pub unsafe fn run_async_routine() {
                     log::warn!("async squirrel function failed to execute; it may not be global");
                 } else {
                     unsafe {
-                        let amount = args(sqvm, sqfunctions);
-
                         (sqfunctions.sq_pushobject)(sqvm, function_obj.as_mut_ptr());
                         (sqfunctions.sq_pushroottable)(sqvm);
 
-                        if (sqfunctions.sq_call)(sqvm, amount, true as u32, true as u32)
+                        let amount = args(sqvm, sqfunctions);
+
+                        if (sqfunctions.sq_call)(sqvm, amount + 1, true as u32, true as u32)
                             == SQRESULT::SQRESULT_ERROR
                         {
                             log::warn!("async squirrel function failed to execute!")

diff --git a/src/high/squirrel.rs b/src/high/squirrel.rs
@@ -6,7 +6,7 @@ use parking_lot::Mutex;
 use std::marker::PhantomData;
 
 use super::{
-    squirrel_traits::{GetFromSquirrelVm, IntoSquirrelArgs, IsSQObject},
+    squirrel_traits::{GetFromSQObject, IntoSquirrelArgs, IsSQObject},
     UnsafeHandle,
 };
 use crate::{
@@ -263,7 +263,7 @@ pub fn register_sq_functions(get_info_func: FuncSQFuncInfo) {
 ///     Ok(())
 /// }
 /// ```
-pub fn call_sq_function<R: GetFromSquirrelVm>(
+pub fn call_sq_function<R: GetFromSQObject>(
     sqvm: *mut HSquirrelVM,
     sqfunctions: &'static SquirrelFunctions,
     function_name: impl AsRef<str>,
@@ -309,7 +309,7 @@ pub fn call_sq_function<R: GetFromSquirrelVm>(
 ///     Ok(())
 /// }
 /// ```
-pub fn call_sq_object_function<R: GetFromSquirrelVm>(
+pub fn call_sq_object_function<R: GetFromSQObject>(
     sqvm: *mut HSquirrelVM,
     sqfunctions: &'static SquirrelFunctions,
     mut obj: SQHandle<SQClosure>,
@@ -318,7 +318,7 @@ pub fn call_sq_object_function<R: GetFromSquirrelVm>(
 }
 
 #[inline]
-fn _call_sq_object_function<R: GetFromSquirrelVm>(
+fn _call_sq_object_function<R: GetFromSQObject>(
     sqvm: *mut HSquirrelVM,
     sqfunctions: &'static SquirrelFunctions,
     ptr: *mut SQObject,
@@ -331,7 +331,12 @@ fn _call_sq_object_function<R: GetFromSquirrelVm>(
         if (sqfunctions.sq_call)(sqvm, 1, true as u32, true as u32) == SQRESULT::SQRESULT_ERROR {
             Err(CallError::FunctionFailedToExecute)
         } else {
-            Ok(R::get_from_sqvm(sqvm, sqfunctions, sqvm._top))
+            Ok(R::get_from_sqobject(
+                sqvm._stack
+                    .add(sqvm._top as usize - 1)
+                    .as_ref()
+                    .ok_or(CallError::FunctionFailedToExecute)?,
+            ))
         }
     }
 }

diff --git a/src/high/squirrel_traits.rs b/src/high/squirrel_traits.rs
@@ -369,6 +369,13 @@ pub trait GetFromSQObject {
     fn get_from_sqobject(obj: &SQObject) -> Self;
 }
 
+impl GetFromSQObject for () {
+    #[inline]
+    fn get_from_sqobject(_: &SQObject) -> Self {
+        ()
+    }
+}
+
 impl GetFromSQObject for String {
     #[inline]
     fn get_from_sqobject(obj: &SQObject) -> Self {