Fix implicit casting when calling a host method with object typed arguments (ClearFoundry#265)

KurtGokhan · web-flow · commit 3ad795c15abe · 2021-06-06T19:26:14.000-04:00
* added test for invalid implicit casting

* fix invalid implicit casting

* fix whitespace changes
diff --git a/ClearScript/Util/TypeHelpers.cs b/ClearScript/Util/TypeHelpers.cs
@@ -183,7 +183,7 @@ public static bool IsAssignableFrom(this Type type, ref object value)
             }
 
             var valueType = value.GetType();
-            if (valueType == type)
+            if (valueType == type || type.IsAssignableFrom(valueType))
             {
                 return true;
             }
diff --git a/ClearScriptTest/BaseMemberAccessTest.cs b/ClearScriptTest/BaseMemberAccessTest.cs
@@ -282,6 +282,14 @@ public void BaseMemberAccess_BindTestMethod_BaseClass()
             Assert.AreEqual(testObject.BaseBindTestMethod(arg), engine.Evaluate("testObject.BaseBindTestMethod(arg)"));
         }
 
+        [TestMethod, TestCategory("BaseMemberAccess")]
+        public void BaseMemberAccess_ObjectTypedArgMethod()
+        {
+            var arg = new TestArg() as BaseTestArg;
+            engine.AddRestrictedHostObject("arg", arg);
+            Assert.AreEqual(testObject.ObjectTypedArgMethod(arg), engine.Evaluate("testObject.ObjectTypedArgMethod(arg)"));
+        }
+        
         [TestMethod, TestCategory("BaseMemberAccess")]
         public void BaseMemberAccess_BindTestMethod_Interface()
         {
diff --git a/ClearScriptTest/BaseTestObject.cs b/ClearScriptTest/BaseTestObject.cs
@@ -46,6 +46,8 @@ public double BaseBindTestMethod<T>(T arg)
             return TestUtil.CalcTestValue(new Guid("c0f52143-a775-4b71-b206-a759285a35a5"), this, typeof(T), arg);
         }
 
+        public object ObjectTypedArgMethod(object arg) => arg;
+
         #region Implementation of IBaseTestInterface
 
         public int[] BaseInterfaceProperty { get; set; }
diff --git a/ClearScriptTest/Misc.cs b/ClearScriptTest/Misc.cs
@@ -24,6 +24,7 @@ public interface ITestArg
 
     public class TestArg : BaseTestArg, ITestArg
     {
+        public static implicit operator string(TestArg arg) => "";
     }
 
     public enum TestEnum : short

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public static bool IsAssignableFrom(this Type type, ref object value)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`var valueType = value.GetType();`
`186`		`- if (valueType == type)`
	`186`	`+ if (valueType == type \|\| type.IsAssignableFrom(valueType))`
`187`	`187`	`{`
`188`	`188`	`return true;`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,14 @@ public void BaseMemberAccess_BindTestMethod_BaseClass()`
`282`	`282`	`Assert.AreEqual(testObject.BaseBindTestMethod(arg), engine.Evaluate("testObject.BaseBindTestMethod(arg)"));`
`283`	`283`	`}`
`284`	`284`
	`285`	`+ [TestMethod, TestCategory("BaseMemberAccess")]`
	`286`	`+ public void BaseMemberAccess_ObjectTypedArgMethod()`
	`287`	`+ {`
	`288`	`+ var arg = new TestArg() as BaseTestArg;`
	`289`	`+ engine.AddRestrictedHostObject("arg", arg);`
	`290`	`+ Assert.AreEqual(testObject.ObjectTypedArgMethod(arg), engine.Evaluate("testObject.ObjectTypedArgMethod(arg)"));`
	`291`	`+ }`
	`292`	`+`
`285`	`293`	`[TestMethod, TestCategory("BaseMemberAccess")]`
`286`	`294`	`public void BaseMemberAccess_BindTestMethod_Interface()`
`287`	`295`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ public double BaseBindTestMethod<T>(T arg)`
`46`	`46`	`return TestUtil.CalcTestValue(new Guid("c0f52143-a775-4b71-b206-a759285a35a5"), this, typeof(T), arg);`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ public object ObjectTypedArgMethod(object arg) => arg;`
	`50`	`+`
`49`	`51`	`#region Implementation of IBaseTestInterface`
`50`	`52`
`51`	`53`	`public int[] BaseInterfaceProperty { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public interface ITestArg`
`24`	`24`
`25`	`25`	`public class TestArg : BaseTestArg, ITestArg`
`26`	`26`	`{`
	`27`	`+ public static implicit operator string(TestArg arg) => "";`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public enum TestEnum : short`