fixed crash in finalizer of CLR types defined in Python, that survive… · pythonnet/pythonnet@1fd6dc2 · GitHub

pythonnet / pythonnet Public

• Notifications You must be signed in to change notification settings
• Fork 780
• Star 5.5k

• Code
• Issues 153
• Pull requests 12
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 1fd6dc2

Browse filesBrowse the repository at this point in the historyBrowse files

lostmsu

committed

fixed crash in finalizer of CLR types defined in Python, that survive engine shutdown

#1256 #1256 During engine shutdown all links from Python to .NET instances are severed. If an instance of CLR class defined in Python survives the shutdown (for example, a reference is stored in static field) and later gets finalized, it will attempt to severe link again, which is an invalid operation. The fix is to check if the link has already been severed and skip that step during finalization.

1 parent 44a36dc commit 1fd6dc2
Copy full SHA for 1fd6dc2

1 file changed

+2-2Lines changed: 2 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/runtime
  • classderived.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/runtime/classderived.cs‎

Copy file name to clipboardExpand all lines: src/runtime/classderived.cs

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -857,7 +857,7 @@ public static void Finalize(IPythonDerivedType obj)
857	857	{
858	858	if (0 == Runtime.Py_IsInitialized() || Runtime.IsFinalizing)
859	859	{
860		- self.gcHandle.Free();
	860	+ if (self.gcHandle.IsAllocated) self.gcHandle.Free();
861	861	return;
862	862	}
863	863	}
@@ -872,7 +872,7 @@ public static void Finalize(IPythonDerivedType obj)
872	872	// If python's been terminated then just free the gchandle.
873	873	if (0 == Runtime.Py_IsInitialized() || Runtime.IsFinalizing)
874	874	{
875		- self.gcHandle.Free();
	875	+ if (self.gcHandle.IsAllocated) self.gcHandle.Free();
876	876	return;
877	877	}
878	878

0 commit comments

Comments

0 (0)