corrected reference counting in Codecs

lostmsu · lostmsu · commit 50a3822bf49f · 2020-02-20T23:31:54.000-08:00
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -138,8 +138,10 @@ internal static IntPtr ToPython(object value, Type type)
             if (Type.GetTypeCode(type) == TypeCode.Object && value.GetType() != typeof(object)) {
                 var encoded = PyObjectConversions.TryEncode(value, type);
                 if (encoded != null) {
-                    Runtime.XIncref(encoded.Handle);
-                    return encoded.Handle;
+                    result = encoded.Handle;
+                    Runtime.XIncref(result);
+                    encoded.Dispose();
+                    return result;
                 }
             }
 
diff --git a/src/runtime/converterextensions.cs b/src/runtime/converterextensions.cs
@@ -124,7 +124,7 @@ internal static bool TryDecode(IntPtr pyHandle, IntPtr pyType, Type targetType,
         static Converter.TryConvertFromPythonDelegate GetDecoder(IntPtr sourceType, Type targetType)
         {
             IPyObjectDecoder decoder;
-            using (var pyType = new PyObject(sourceType))
+            using (var pyType = new PyObject(Runtime.SelfIncRef(sourceType)))
             {
                 lock (decoders)
                 {

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,10 @@ internal static IntPtr ToPython(object value, Type type)`
`138`	`138`	`if (Type.GetTypeCode(type) == TypeCode.Object && value.GetType() != typeof(object)) {`
`139`	`139`	`var encoded = PyObjectConversions.TryEncode(value, type);`
`140`	`140`	`if (encoded != null) {`
`141`		`- Runtime.XIncref(encoded.Handle);`
`142`		`- return encoded.Handle;`
	`141`	`+ result = encoded.Handle;`
	`142`	`+ Runtime.XIncref(result);`
	`143`	`+ encoded.Dispose();`
	`144`	`+ return result;`
`143`	`145`	`}`
`144`	`146`	`}`
`145`	`147`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ internal static bool TryDecode(IntPtr pyHandle, IntPtr pyType, Type targetType,`
`124`	`124`	`static Converter.TryConvertFromPythonDelegate GetDecoder(IntPtr sourceType, Type targetType)`
`125`	`125`	`{`
`126`	`126`	`IPyObjectDecoder decoder;`
`127`		`- using (var pyType = new PyObject(sourceType))`
	`127`	`+ using (var pyType = new PyObject(Runtime.SelfIncRef(sourceType)))`
`128`	`128`	`{`
`129`	`129`	`lock (decoders)`
`130`	`130`	`{`