Take GIL when checking if error occurred on shutdown (#1836)

filmor · web-flow · commit a49f3a885f8e · 2022-06-27T11:45:31.000+02:00
diff --git a/src/runtime/PythonEngine.cs b/src/runtime/PythonEngine.cs
@@ -355,12 +355,17 @@ public static void Shutdown()
             {
                 return;
             }
-            if (Exceptions.ErrorOccurred())
+
+            using (Py.GIL())
             {
-                throw new InvalidOperationException(
-                    "Python error indicator is set",
-                    innerException: PythonException.PeekCurrentOrNull(out _));
+                if (Exceptions.ErrorOccurred())
+                {
+                    throw new InvalidOperationException(
+                        "Python error indicator is set",
+                        innerException: PythonException.PeekCurrentOrNull(out _));
+                }
             }
+
             // If the shutdown handlers trigger a domain unload,
             // don't call shutdown again.
             AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;

Original file line number	Diff line number	Diff line change
`@@ -355,12 +355,17 @@ public static void Shutdown()`
`355`	`355`	`{`
`356`	`356`	`return;`
`357`	`357`	`}`
`358`		`- if (Exceptions.ErrorOccurred())`
	`358`	`+`
	`359`	`+ using (Py.GIL())`
`359`	`360`	`{`
`360`		`- throw new InvalidOperationException(`
`361`		`- "Python error indicator is set",`
`362`		`- innerException: PythonException.PeekCurrentOrNull(out _));`
	`361`	`+ if (Exceptions.ErrorOccurred())`
	`362`	`+ {`
	`363`	`+ throw new InvalidOperationException(`
	`364`	`+ "Python error indicator is set",`
	`365`	`+ innerException: PythonException.PeekCurrentOrNull(out _));`
	`366`	`+ }`
`363`	`367`	`}`
	`368`	`+`
`364`	`369`	`// If the shutdown handlers trigger a domain unload,`
`365`	`370`	`// don't call shutdown again.`
`366`	`371`	`AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;`