Commit3069285

lostmsu

authored and

BadSingleton

committed

fixed crash in finalizer of CLR types defined in Python, that survive engine shutdown (#1260)

#1256 #1256During 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 parent639236a commit3069285Copy full SHA for 3069285

File tree

1 file changed

-2

lines changed

src/runtime
- classderived.cs

1 file changed

-2

lines changed

`‎src/runtime/classderived.cs‎`

Lines changed: 2 additions & 2 deletions

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

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3069285

File tree

1 file changed

1 file changed

`‎src/runtime/classderived.cs‎`

0 commit comments