fixed Python derived types crashing on shutdown of Python process · pythonnet/pythonnet@7ff467a · 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 7ff467a

Browse filesBrowse the repository at this point in the historyBrowse files

lostmsu

committed

fixed Python derived types crashing on shutdown of Python process

clearing GCHandle from an instance of Python derived type would drop the last reference to it, so it was destroyed without being removed from reflectedObjects collection

1 parent d6ef48e commit 7ff467a
Copy full SHA for 7ff467a

2 files changed

+6-4Lines changed: 6 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/runtime
  • extensiontype.cs
  • runtime.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/runtime/extensiontype.cs‎

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

+5-4Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -80,16 +80,17 @@ public unsafe static void tp_dealloc(NewReference lastRef)
80	80
81	81	tp_clear(lastRef.Borrow());
82	82
83		- bool deleted = loadedExtensions.Remove(lastRef.DangerousGetAddress());
84		- Debug.Assert(deleted);
85		-
86	83	// we must decref our type: https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_dealloc
87	84	DecrefTypeAndFree(lastRef.Steal());
88	85	}
89	86
90	87	public static int tp_clear(BorrowedReference ob)
91	88	{
92		- TryFreeGCHandle(ob);
	89	+ if (TryFreeGCHandle(ob))
	90	+ {
	91	+ bool deleted = loadedExtensions.Remove(ob.DangerousGetAddress());
	92	+ Debug.Assert(deleted);
	93	+ }
93	94
94	95	int res = ClassBase.BaseUnmanagedClear(ob);
95	96	return res;

Collapse file

‎src/runtime/runtime.cs‎

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

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -339,6 +339,7 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops)
339	339	else if (forceBreakLoops)
340	340	{
341	341	NullGCHandles(CLRObject.reflectedObjects);
	342	+ CLRObject.reflectedObjects.Clear();
342	343	}
343	344	}
344	345	return false;

0 commit comments

Comments

0 (0)