Merge pull request #1484 from losttech/Mini/NoCrashWhenSequenceLengthUndefined

filmor · web-flow · commit 2ac5f4e3d3d7 · 2021-07-07T10:16:11.000+02:00
Fixed crash in ToArray when sequence explicitly denies __len__
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -882,17 +882,26 @@ private static bool ToArray(IntPtr value, Type obType, out object result, bool s
                 // See https://docs.microsoft.com/en-us/dotnet/api/system.type.makegenerictype#System_Type_MakeGenericType_System_Type
                 var constructedListType = typeof(List<>).MakeGenericType(elementType);
                 bool IsSeqObj = Runtime.PySequence_Check(value);
+                object[] constructorArgs = Array.Empty<object>();
                 if (IsSeqObj)
                 {
                     var len = Runtime.PySequence_Size(value);
-                    list = (IList)Activator.CreateInstance(constructedListType, new Object[] { (int)len });
-                }
-                else
-                {
-                    // CreateInstance can throw even if MakeGenericType succeeded.
-                    // See https://docs.microsoft.com/en-us/dotnet/api/system.activator.createinstance#System_Activator_CreateInstance_System_Type_
-                    list = (IList)Activator.CreateInstance(constructedListType);
+                    if (len >= 0)
+                    {
+                        if (len <= int.MaxValue)
+                        {
+                            constructorArgs = new object[] { (int)len };
+                        }
+                    }
+                    else
+                    {
+                        // for the sequences, that explicitly deny calling __len__()
+                        Exceptions.Clear();
+                    }
                 }
+                // CreateInstance can throw even if MakeGenericType succeeded.
+                // See https://docs.microsoft.com/en-us/dotnet/api/system.activator.createinstance#System_Activator_CreateInstance_System_Type_
+                list = (IList)Activator.CreateInstance(constructedListType, args: constructorArgs);
             }
             catch (Exception e)
             {
