do not allow encoders for System.String

lostmsu · lostmsu · commit fe40b785555d · 2020-06-01T10:59:41.000-07:00
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -134,7 +134,7 @@ internal static IntPtr ToPython(object value, Type type)
                 return result;
             }
 
-            if (!type.IsPrimitive && value.GetType() != typeof(object)) {
+            if (EncodersAllowed(type)) {
                 var encoded = PyObjectConversions.TryEncode(value, type);
                 if (encoded != null) {
                     result = encoded.Handle;
@@ -402,7 +402,7 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
                 return false;
             }
 
-            if (!obType.IsPrimitive)
+            if (EncodersAllowed(obType))
             {
                 var pyType = new BorrowedReference(Runtime.PyObject_TYPE(value));
                 if (PyObjectConversions.TryDecode(new BorrowedReference(value), pyType, obType, out result))
@@ -419,6 +419,8 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
             return ToPrimitive(value, obType, out result, setError);
         }
 
+        static bool EncodersAllowed(Type type) => !type.IsPrimitive && type != typeof(string);
+
         internal delegate bool TryConvertFromPythonDelegate(BorrowedReference pyObj, out object result);
 
         /// <summary>
diff --git a/src/runtime/converterextensions.cs b/src/runtime/converterextensions.cs
@@ -5,6 +5,8 @@ namespace Python.Runtime
     using System.Collections.Generic;
     using System.Linq;
     using System.Reflection;
+    using System.Runtime.CompilerServices;
+
     using Python.Runtime.Codecs;
 
     /// <summary>
@@ -128,6 +130,8 @@ internal static bool TryDecode(BorrowedReference obj, BorrowedReference objType,
 
         static Converter.TryConvertFromPythonDelegate GetDecoder(IntPtr sourceType, Type targetType)
         {
+            RuntimeHelpers.EnsureSufficientExecutionStack();
+
             IPyObjectDecoder decoder;
             var pyType = new PyObject(Runtime.SelfIncRef(sourceType));
             lock (decoders)

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ internal static IntPtr ToPython(object value, Type type)`
`134`	`134`	`return result;`
`135`	`135`	`}`
`136`	`136`
`137`		`- if (!type.IsPrimitive && value.GetType() != typeof(object)) {`
	`137`	`+ if (EncodersAllowed(type)) {`
`138`	`138`	`var encoded = PyObjectConversions.TryEncode(value, type);`
`139`	`139`	`if (encoded != null) {`
`140`	`140`	`result = encoded.Handle;`
`@@ -402,7 +402,7 @@ internal static bool ToManagedValue(IntPtr value, Type obType,`
`402`	`402`	`return false;`
`403`	`403`	`}`
`404`	`404`
`405`		`- if (!obType.IsPrimitive)`
	`405`	`+ if (EncodersAllowed(obType))`
`406`	`406`	`{`
`407`	`407`	`var pyType = new BorrowedReference(Runtime.PyObject_TYPE(value));`
`408`	`408`	`if (PyObjectConversions.TryDecode(new BorrowedReference(value), pyType, obType, out result))`
`@@ -419,6 +419,8 @@ internal static bool ToManagedValue(IntPtr value, Type obType,`
`419`	`419`	`return ToPrimitive(value, obType, out result, setError);`
`420`	`420`	`}`
`421`	`421`
	`422`	`+ static bool EncodersAllowed(Type type) => !type.IsPrimitive && type != typeof(string);`
	`423`	`+`
`422`	`424`	`internal delegate bool TryConvertFromPythonDelegate(BorrowedReference pyObj, out object result);`
`423`	`425`
`424`	`426`	`/// <summary>`