Fix a ref count issue in PythonException

BadSingleton · BadSingleton · commit ee30c94a5814 · 2021-02-26T13:26:53.000-05:00
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -166,7 +166,16 @@ public void Normalize()
             {
                 if (Exceptions.ErrorOccurred()) throw new InvalidOperationException("Cannot normalize when an error is set");
                 // If an error is set and this PythonException is unnormalized, the error will be cleared and the PythonException will be replaced by a different error.
+                IntPtr oldValue = _pyValue;
                 Runtime.PyErr_NormalizeException(ref _pyType, ref _pyValue, ref _pyTB);
+
+                if (_pyValue != oldValue) 
+                {
+                    // we own the reference to _pyValue, so make adjustments if it changed.
+                    // Disown old, own new
+                    Runtime.XDecref(oldValue);
+                    Runtime.XIncref(_pyValue);
+                }
             }
             finally
             {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,16 @@ public void Normalize()`
`166`	`166`	`{`
`167`	`167`	`if (Exceptions.ErrorOccurred()) throw new InvalidOperationException("Cannot normalize when an error is set");`
`168`	`168`	`// If an error is set and this PythonException is unnormalized, the error will be cleared and the PythonException will be replaced by a different error.`
	`169`	`+ IntPtr oldValue = _pyValue;`
`169`	`170`	`Runtime.PyErr_NormalizeException(ref _pyType, ref _pyValue, ref _pyTB);`
	`171`	`+`
	`172`	`+ if (_pyValue != oldValue)`
	`173`	`+ {`
	`174`	`+ // we own the reference to _pyValue, so make adjustments if it changed.`
	`175`	`+ // Disown old, own new`
	`176`	`+ Runtime.XDecref(oldValue);`
	`177`	`+ Runtime.XIncref(_pyValue);`
	`178`	`+ }`
`170`	`179`	`}`
`171`	`180`	`finally`
`172`	`181`	`{`