do not dispose object, that might have been just decoded succesfully, as the decoded object might store a reference to the original PyObject

lostmsu · lostmsu · commit 399ae545c9c6 · 2020-02-23T15:10:22.000-08:00
diff --git a/src/runtime/converterextensions.cs b/src/runtime/converterextensions.cs
@@ -137,13 +137,16 @@ static Converter.TryConvertFromPythonDelegate GetDecoder(IntPtr sourceType, Type
 
             bool TryDecode(IntPtr pyHandle, out object result)
             {
-                using (var pyObj = new PyObject(Runtime.SelfIncRef(pyHandle)))
+                var pyObj = new PyObject(Runtime.SelfIncRef(pyHandle));
+                var @params = new object[] { pyObj, null };
+                bool success = (bool)decode.Invoke(decoder, @params);
+                if (!success)
                 {
-                    var @params = new object[] { pyObj, null };
-                    bool success = (bool)decode.Invoke(decoder, @params);
-                    result = @params[1];
-                    return success;
+                    pyObj.Dispose();
                 }
+
+                result = @params[1];
+                return success;
             }
 
             return TryDecode;

Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,16 @@ static Converter.TryConvertFromPythonDelegate GetDecoder(IntPtr sourceType, Type`
`137`	`137`
`138`	`138`	`bool TryDecode(IntPtr pyHandle, out object result)`
`139`	`139`	`{`
`140`		`- using (var pyObj = new PyObject(Runtime.SelfIncRef(pyHandle)))`
	`140`	`+ var pyObj = new PyObject(Runtime.SelfIncRef(pyHandle));`
	`141`	`+ var @params = new object[] { pyObj, null };`
	`142`	`+ bool success = (bool)decode.Invoke(decoder, @params);`
	`143`	`+ if (!success)`
`141`	`144`	`{`
`142`		`- var @params = new object[] { pyObj, null };`
`143`		`- bool success = (bool)decode.Invoke(decoder, @params);`
`144`		`- result = @params[1];`
`145`		`- return success;`
	`145`	`+ pyObj.Dispose();`
`146`	`146`	`}`
	`147`	`+`
	`148`	`+ result = @params[1];`
	`149`	`+ return success;`
`147`	`150`	`}`
`148`	`151`
`149`	`152`	`return TryDecode;`