fixed crash in MethodBinder.Bind when MethodInfo to invoke is passed explicitly

lostmsu · lostmsu · commit 80a9e660162d · 2019-10-21T12:10:02.000-07:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
@@ -169,16 +170,16 @@ internal MethodBase[] GetMethods()
                 // I'm sure this could be made more efficient.
                 list.Sort(new MethodSorter());
                 methods = (MethodBase[])list.ToArray(typeof(MethodBase));
-                pyArgumentConverter = this.GetArgumentConverter();
+                pyArgumentConverter = GetArgumentConverter(this.methods);
                 init = true;
             }
             return methods;
         }
 
-        IPyArgumentConverter GetArgumentConverter() {
+        static IPyArgumentConverter GetArgumentConverter(IEnumerable<MethodBase> methods) {
             IPyArgumentConverter converter = null;
             Type converterType = null;
-            foreach (MethodBase method in this.methods)
+            foreach (MethodBase method in methods)
             {
                 PyArgConverterAttribute attribute = TryGetArgConverter(method.DeclaringType);
                 if (converterType == null)
@@ -344,14 +345,17 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
 
             var pynargs = (int)Runtime.PyTuple_Size(args);
             var isGeneric = false;
+            IPyArgumentConverter argumentConverter;
             if (info != null)
             {
                 _methods = new MethodBase[1];
                 _methods.SetValue(info, 0);
+                argumentConverter = GetArgumentConverter(_methods);
             }
             else
             {
                 _methods = GetMethods();
+                argumentConverter = this.pyArgumentConverter;
             }
 
             // TODO: Clean up
@@ -370,7 +374,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                     continue;
                 }
                 var outs = 0;
-                var margs = this.TryConvertArguments(pi, paramsArray, args, pynargs, kwargDict, defaultArgList,
+                var margs = TryConvertArguments(pi, paramsArray, argumentConverter,
+                    args, pynargs, kwargDict, defaultArgList,
                     needsResolution: _methods.Length > 1,
                     outs: out outs);
 
@@ -426,7 +431,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
         /// <param name="needsResolution"><c>true</c>, if overloading resolution is required</param>
         /// <param name="outs">Returns number of output parameters</param>
         /// <returns>An array of .NET arguments, that can be passed to a method.</returns>
-        object[] TryConvertArguments(ParameterInfo[] pi, bool paramsArray,
+        static object[] TryConvertArguments(ParameterInfo[] pi, bool paramsArray,
+            IPyArgumentConverter argumentConverter,
             IntPtr args, int pyArgCount,
             Dictionary<string, IntPtr> kwargDict,
             ArrayList defaultArgList,
@@ -467,7 +473,7 @@ object[] TryConvertArguments(ParameterInfo[] pi, bool paramsArray,
                 }
 
                 bool isOut;
-                if (!this.pyArgumentConverter.TryConvertArgument(
+                if (!argumentConverter.TryConvertArgument(
                     op, parameter.ParameterType, needsResolution,
                     out margs[paramIndex], out isOut))
                 {
