Commit9bb8fe6

authored

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

Fixed a leak in `NewReference.Move`

2 parents863397a +469ec67 commit9bb8fe6Copy full SHA for 9bb8fe6

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ internal IncorrectRefCountException(IntPtr ptr)`
`106`	`106`
`107`	`107`	`#endregion`
`108`	`108`
	`109`	`+[ForbidPythonThreads]`
`109`	`110`	`publicvoidCollect()=>this.DisposeAll();`
`110`	`111`
`111`	`112`	`internalvoidThrottledCollect()`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public PyObject MoveToPyObject()`
`47`	`47`	`/// </summary>`
`48`	`48`	`publicNewReferenceMove()`
`49`	`49`	`{`
`50`		`-varresult=newNewReference(this);`
	`50`	`+varresult=DangerousFromPointer(this.DangerousGetAddress());`
`51`	`51`	`this.pointer=default;`
`52`	`52`	`returnresult;`
`53`	`53`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,7 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops)`
`359`	`359`	`/// </summary>`
`360`	`360`	`/// <param name="runs">Total number of GC loops to run</param>`
`361`	`361`	`/// <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>`
	`362`	`+[ForbidPythonThreads]`
`362`	`363`	`publicstaticboolTryCollectingGarbage(intruns)`
`363`	`364`	`=>TryCollectingGarbage(runs,forceBreakLoops:false);`
`364`	`365`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"""Test CLR class constructor support."""`
`4`	`4`
`5`	`5`	`importpytest`
	`6`	`+importsys`
`6`	`7`
`7`	`8`	`importSystem`
`8`	`9`
`@@ -71,6 +72,19 @@ def test_default_constructor_fallback():`
`71`	`72`	`ob=DefaultConstructorMatching("2")`
`72`	`73`
`73`	`74`
	`75`	`+deftest_constructor_leak():`
	`76`	`+fromSystemimportUri`
	`77`	`+fromPython.RuntimeimportRuntime`
	`78`	`+`
	`79`	`+uri=Uri("http://www.python.org")`
	`80`	`+Runtime.TryCollectingGarbage(20)`
	`81`	`+ref_count=sys.getrefcount(uri)`
	`82`	`+`
	`83`	`+# check disabled due to GC uncertainty`
	`84`	`+# assert ref_count == 1`
	`85`	`+`
	`86`	`+`
	`87`	`+`
`74`	`88`	`deftest_string_constructor():`
`75`	`89`	`fromSystemimportString,Char,Array`
`76`	`90`

Comments

(0)