do not attempt to deallocate GCHandle of Python derived type instance from finalizer when it is not allocated (could have been cleared)

lostmsu · lostmsu · commit 6b87b388bb00 · 2021-03-30T20:42:46.000-07:00
diff --git a/src/runtime/classderived.cs b/src/runtime/classderived.cs
@@ -257,7 +257,7 @@ internal static Type CreateDerivedType(string name,
                 Type.EmptyTypes);
             ILGenerator il = methodBuilder.GetILGenerator();
             il.Emit(OpCodes.Ldarg_0);
-            il.Emit(OpCodes.Call, typeof(PythonDerivedType).GetMethod("Finalize"));
+            il.Emit(OpCodes.Call, typeof(PythonDerivedType).GetMethod(nameof(PythonDerivedType.Finalize)));
             il.Emit(OpCodes.Ldarg_0);
             il.Emit(OpCodes.Call, baseClass.GetMethod("Finalize", BindingFlags.NonPublic | BindingFlags.Instance));
             il.Emit(OpCodes.Ret);
@@ -775,8 +775,8 @@ public static T InvokeGetProperty<T>(IPythonDerivedType obj, string propertyName
                 Runtime.XIncref(self.pyHandle);
                 using var pyself = new PyObject(self.pyHandle);
                 PyObject pyvalue = pyself.GetAttr(propertyName);
-                    return (T)pyvalue.AsManagedObject(typeof(T));
-                }
+                return (T)pyvalue.AsManagedObject(typeof(T));
+            }
             finally
             {
                 Runtime.PyGILState_Release(gs);
@@ -886,7 +886,7 @@ public static void Finalize(IPythonDerivedType obj)
                             Runtime.XDecref(dict);
                         }
                         Runtime.PyObject_GC_Del(self.pyHandle);
-                        self.gcHandle.Free();
+                        if (self.gcHandle.IsAllocated) self.gcHandle.Free();
                     }
                     finally
                     {
