Additional check for object copying

SDraw · Jun 10, 2023 · 2eec57f · 2eec57f
1 parent 4d57686
commit 2eec57f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CVRLua/Lua/LuaDefs/ObjectDefs.cs b/CVRLua/Lua/LuaDefs/ObjectDefs.cs
@@ -68,7 +68,7 @@ static int Destroy(IntPtr p_state)
             {
                 if(l_obj != null)
                 {
-                    if(l_obj.IsSafeToDestroy())
+                    if(l_obj.IsSafeToManipulate())
                     {
                         UnityEngine.Object.Destroy(l_obj);
                         l_argReader.PushBoolean(true);
@@ -98,8 +98,16 @@ static int Instantiate(IntPtr p_state)
             {
                 if(l_obj != null)
                 {
-                    UnityEngine.Object l_copy = UnityEngine.Object.Instantiate(l_obj);
-                    l_argReader.PushObject(l_copy);
+                    if(l_obj.IsSafeToManipulate())
+                    {
+                        UnityEngine.Object l_copy = UnityEngine.Object.Instantiate(l_obj);
+                        l_argReader.PushObject(l_copy);
+                    }
+                    else
+                    {
+                        l_argReader.SetError("Attempt to instantiate unsafe Object");
+                        l_argReader.PushBoolean(false);
+                    }
                 }
                 else
                 {

diff --git a/CVRLua/Main.cs b/CVRLua/Main.cs
@@ -10,7 +10,7 @@ namespace CVRLua
 {
     public class Core : MelonLoader.MelonMod
     {
-        public const int c_modRelease = 25;
+        public const int c_modRelease = 26;
 
         static public Core Instance { get; private set; } = null;
 

diff --git a/CVRLua/Utils.cs b/CVRLua/Utils.cs
@@ -49,7 +49,7 @@ public static void MergeInto<T>(this List<T> p_source, List<T> p_target)
             p_source.ForEach(p => p_target.Add(p));
         }
 
-        public static bool IsSafeToDestroy(this UnityEngine.Object p_object)
+        public static bool IsSafeToManipulate(this UnityEngine.Object p_object)
         {
             GameObject l_rootObject = null;
             if(p_object is Component)