Merge pull request #1873 from losttech/bugs/ctor-leak

filmor · web-flow · commit 9bb8fe69ca02 · 2022-07-14T21:48:20.000+02:00
Fixed a leak in `NewReference.Move`
diff --git a/src/runtime/Finalizer.cs b/src/runtime/Finalizer.cs
@@ -106,6 +106,7 @@ internal IncorrectRefCountException(IntPtr ptr)
 
         #endregion
 
+        [ForbidPythonThreads]
         public void Collect() => this.DisposeAll();
 
         internal void ThrottledCollect()
diff --git a/src/runtime/Native/NewReference.cs b/src/runtime/Native/NewReference.cs
@@ -47,7 +47,7 @@ public PyObject MoveToPyObject()
         /// </summary>
         public NewReference Move()
         {
-            var result = new NewReference(this);
+            var result = DangerousFromPointer(this.DangerousGetAddress());
             this.pointer = default;
             return result;
         }
diff --git a/src/runtime/Runtime.cs b/src/runtime/Runtime.cs
@@ -359,6 +359,7 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops)
         /// </summary>
         /// <param name="runs">Total number of GC loops to run</param>
         /// <returns><c>true</c> if a steady state was reached upon the requested number of tries (e.g. on the last try no objects were collected).</returns>
+        [ForbidPythonThreads]
         public static bool TryCollectingGarbage(int runs)
             => TryCollectingGarbage(runs, forceBreakLoops: false);
 
diff --git a/tests/test_constructors.py b/tests/test_constructors.py
@@ -3,6 +3,7 @@
 """Test CLR class constructor support."""
 
 import pytest
+import sys
 
 import System
 
@@ -71,6 +72,19 @@ def test_default_constructor_fallback():
         ob = DefaultConstructorMatching("2")
 
 
+def test_constructor_leak():
+    from System import Uri
+    from Python.Runtime import Runtime
+
+    uri = Uri("http://www.python.org")
+    Runtime.TryCollectingGarbage(20)
+    ref_count = sys.getrefcount(uri)
+
+    # check disabled due to GC uncertainty
+    # assert ref_count == 1
+
+
+
 def test_string_constructor():
     from System import String, Char, Array
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public PyObject MoveToPyObject()`
`47`	`47`	`/// </summary>`
`48`	`48`	`public NewReference Move()`
`49`	`49`	`{`
`50`		`- var result = new NewReference(this);`
	`50`	`+ var result = DangerousFromPointer(this.DangerousGetAddress());`
`51`	`51`	`this.pointer = default;`
`52`	`52`	`return result;`
`53`	`53`	`}`