Fixed Ourpalm#319

yaozb-gif · Apr 1, 2020 · ef7a64b · ef7a64b
1 parent 2c10dea
commit ef7a64b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/ILRuntime/Runtime/Enviorment/CLRRedirections.cs b/ILRuntime/Runtime/Enviorment/CLRRedirections.cs
@@ -1032,7 +1032,12 @@ static object CheckCrossBindingAdapter(object obj)
                     if (islong)
                         res = ((List<long>)list).ToArray();
                     else
-                        res = ((List<int>)list).ToArray();
+                    {
+                        if (list == null)
+                            res = new int[0];
+                        else
+                            res = ((List<int>)list).ToArray();
+                    }
                     return ILIntepreter.PushObject(ret, mStack, res, true);
                 }
                 else

diff --git a/TestCases/EnumTest.cs b/TestCases/EnumTest.cs
@@ -55,6 +55,11 @@ enum TestEnumSByte : sbyte
             Max = sbyte.MaxValue
         }
 
+        enum TestEnumEmpty
+        {
+
+        }
+
         static TestEnum b = TestEnum.Enum2;
 
         public static string Test01()
@@ -258,6 +263,12 @@ static void Test18Sub(ulong val, out TestEnum e)
         {
             e = (TestEnum)val;
         }
+
+        public static void Test19()
+        {
+            Console.WriteLine(Enum.GetValues(typeof(TestEnumEmpty)).Length);
+        }
+
         class SystemType
         {
             public int value = 10;

diff --git a/TestCases/InheritanceTest.cs b/TestCases/InheritanceTest.cs
@@ -155,6 +155,20 @@ public static void InheritanceTest11()
             sub.Test();
         }
 
+        static void InheritanceTest12Sub()
+        {
+            Console.WriteLine("OK");
+        }
+
+        public static void InheritanceTest12()
+        {
+            for(int i = 0; i < 5; i++)
+            {
+                System.Type t = typeof(InheritanceTest);
+                t.GetMethod("InheritanceTest12Sub", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static).Invoke(null, null);
+            }
+        }
+
         class TestCls5 : TestClass2
         {
             public override float AbMethod2(int arg1)