Fixed a errors leading to null reference exceptions in the ReflectionHelpers class

Taritsyn · Taritsyn · commit 3930d87b2407 · 2019-12-16T19:38:45.000+03:00
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
 	"sdk": {
-		"version": "3.0.100"
+		"version": "3.0.101"
 	}
 }
diff --git a/src/MsieJavaScriptEngine/Helpers/ReflectionHelpers.cs b/src/MsieJavaScriptEngine/Helpers/ReflectionHelpers.cs
@@ -70,6 +70,11 @@ public static MethodInfo[] GetFullyFledgedMethods(MethodInfo[] methods)
 
 		public static void FixFieldValueType(ref object value, FieldInfo field)
 		{
+			if (value == null)
+			{
+				return;
+			}
+
 			Type valueType = value.GetType();
 			Type fieldType = field.FieldType;
 
@@ -86,6 +91,11 @@ public static void FixFieldValueType(ref object value, FieldInfo field)
 
 		public static void FixPropertyValueType(ref object value, PropertyInfo property)
 		{
+			if (value == null)
+			{
+				return;
+			}
+
 			Type valueType = value.GetType();
 			Type propertyType = property.PropertyType;
 
@@ -107,6 +117,11 @@ public static void FixArgumentTypes(ref object[] argValues, ParameterInfo[] para
 			for (int argIndex = 0; argIndex < argCount; argIndex++)
 			{
 				object argValue = argValues[argIndex];
+				if (argValue == null)
+				{
+					continue;
+				}
+
 				Type argType = argValue.GetType();
 
 				ParameterInfo parameter = parameters[argIndex];
@@ -149,7 +164,7 @@ public static MethodBase GetBestFitMethod(MethodBase[] methods, object[] argValu
 			}
 
 			Type[] argTypes = argValues
-				.Select(a => a.GetType())
+				.Select(a => a != null ? a.GetType() : typeof(object))
 				.ToArray()
 				;
 			var compatibleMethods = new List<MethodWithMetadata>();
diff --git a/src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj b/src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj
@@ -24,8 +24,7 @@
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
-		<PackageReleaseNotes>1. Fixed a error that caused a crash during finalization;
-2. In JsRT modes during calling of the `CollectGarbage` method is again not performed blocking.</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed a errors leading to null reference exceptions in the `ReflectionHelpers` class. Special thanks to Vanjoge.</PackageReleaseNotes>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageOutputPath>../../nuget</PackageOutputPath>
 		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
diff --git a/src/MsieJavaScriptEngine/readme.txt b/src/MsieJavaScriptEngine/readme.txt
@@ -21,9 +21,8 @@
    =============
    RELEASE NOTES
    =============
-   1. Fixed a error that caused a crash during finalization;
-   2. In JsRT modes during calling of the `CollectGarbage` method is again not
-      performed blocking.
+   Fixed a errors leading to null reference exceptions in the `ReflectionHelpers`
+   class. Special thanks to Vanjoge.
 
    ============
    PROJECT SITE
diff --git a/test/MsieJavaScriptEngine.Test.Common/Interop/FileManager.cs b/test/MsieJavaScriptEngine.Test.Common/Interop/FileManager.cs
@@ -1,18 +1,26 @@
 ﻿using System;
 using System.IO;
+using System.Text;
 
 namespace MsieJavaScriptEngine.Test.Common.Interop
 {
 	public sealed class FileManager
 	{
 		public string ReadFile(string path)
+		{
+			return ReadFile(path, null);
+		}
+
+		public string ReadFile(string path, Encoding encoding)
 		{
 			if (path == null)
 			{
 				throw new ArgumentNullException("path");
 			}
 
-			string content = File.ReadAllText(path);
+			encoding = encoding ?? Encoding.UTF8;
+
+			string content = File.ReadAllText(path, encoding);
 
 			return content;
 		}
diff --git a/test/MsieJavaScriptEngine.Test.Common/Interop/Person.cs b/test/MsieJavaScriptEngine.Test.Common/Interop/Person.cs
@@ -14,15 +14,26 @@ public string LastName
 			set;
 		}
 
+		public string Patronymic
+		{
+			get;
+			set;
+		}
+
 
 		public Person()
 			: this(string.Empty, string.Empty)
 		{ }
 
 		public Person(string firstName, string lastName)
+			: this(firstName, lastName, string.Empty)
+		{ }
+
+		public Person(string firstName, string lastName, string patronymic)
 		{
 			FirstName = firstName;
 			LastName = lastName;
+			Patronymic = patronymic;
 		}
 
 
diff --git a/test/MsieJavaScriptEngine.Test.Common/Interop/Product.cs b/test/MsieJavaScriptEngine.Test.Common/Interop/Product.cs
@@ -3,6 +3,7 @@
 	public sealed class Product
 	{
 		public string Name;
+		public string Description;
 		public double Price;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs
@@ -69,33 +69,41 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithFieldsIsCorrect(
 			var product = new Product
 			{
 				Name = "Red T-shirt",
+				Description = string.Empty,
 				Price = 995.00
 			};
 
-			const string updateCode = "product.Price *= 1.15;";
+			const string updateCode = @"product.Description = null;
+product.Price *= 1.15;";
 
 			const string input1 = "product.Name";
 			const string targetOutput1 = "Red T-shirt";
 
-			const string input2 = "product.Price";
-			const double targetOutput2 = 1144.25;
+			const string input2 = "product.Description";
+			const string targetOutput2 = null;
+
+			const string input3 = "product.Price";
+			const double targetOutput3 = 1144.25;
 
 			// Act
 			string output1;
-			double output2;
+			string output2;
+			double output3;
 
 			using (var jsEngine = CreateJsEngine())
 			{
 				jsEngine.EmbedHostObject("product", product);
 				jsEngine.Execute(updateCode);
 
 				output1 = jsEngine.Evaluate<string>(input1);
-				output2 = jsEngine.Evaluate<double>(input2);
+				output2 = jsEngine.Evaluate<string>(input2);
+				output3 = jsEngine.Evaluate<double>(input3);
 			}
 
 			// Assert
 			Assert.AreEqual(targetOutput1, output1);
 			Assert.AreEqual(targetOutput2, output2);
+			Assert.AreEqual(targetOutput3, output3);
 		}
 
 		#endregion
@@ -218,17 +226,22 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithPropertiesIsCorr
 		{
 			// Arrange
 			var person = new Person("Vanya", "Ivanov");
-			const string updateCode = "person.LastName = person.LastName.substr(0, 5) + 'ff';";
+			const string updateCode = @"person.LastName = person.LastName.substr(0, 5) + 'ff';
+person.Patronymic = null;";
 
 			const string input1 = "person.FirstName";
 			const string targetOutput1 = "Vanya";
 
 			const string input2 = "person.LastName";
 			const string targetOutput2 = "Ivanoff";
 
+			const string input3 = "person.Patronymic";
+			const string targetOutput3 = null;
+
 			// Act
 			string output1;
 			string output2;
+			string output3;
 
 			using (var jsEngine = CreateJsEngine())
 			{
@@ -237,11 +250,13 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithPropertiesIsCorr
 
 				output1 = jsEngine.Evaluate<string>(input1);
 				output2 = jsEngine.Evaluate<string>(input2);
+				output3 = jsEngine.Evaluate<string>(input3);
 			}
 
 			// Assert
 			Assert.AreEqual(targetOutput1, output1);
 			Assert.AreEqual(targetOutput2, output2);
+			Assert.AreEqual(targetOutput3, output3);
 		}
 
 		[Test]
@@ -405,7 +420,7 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithMethodIsCorrect(
 			var fileManager = new FileManager();
 			string filePath = GetAbsolutePath("SharedFiles/link.txt");
 
-			string input = string.Format("fileManager.ReadFile('{0}')", filePath.Replace(@"\", @"\\"));
+			string input = string.Format("fileManager.ReadFile('{0}', null)", filePath.Replace(@"\", @"\\"));
 			const string targetOutput = "http://www.panopticoncentral.net/2015/09/09/the-two-faces-of-jsrt-in-windows-10/";
 
 			// Act

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.0.100"`
	`3`	`+ "version": "3.0.101"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,26 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Text;`
`3`	`4`
`4`	`5`	`namespace MsieJavaScriptEngine.Test.Common.Interop`
`5`	`6`	`{`
`6`	`7`	`public sealed class FileManager`
`7`	`8`	`{`
`8`	`9`	`public string ReadFile(string path)`
	`10`	`+ {`
	`11`	`+ return ReadFile(path, null);`
	`12`	`+ }`
	`13`	`+`
	`14`	`+ public string ReadFile(string path, Encoding encoding)`
`9`	`15`	`{`
`10`	`16`	`if (path == null)`
`11`	`17`	`{`
`12`	`18`	`throw new ArgumentNullException("path");`
`13`	`19`	`}`
`14`	`20`
`15`		`- string content = File.ReadAllText(path);`
	`21`	`+ encoding = encoding ?? Encoding.UTF8;`
	`22`	`+`
	`23`	`+ string content = File.ReadAllText(path, encoding);`
`16`	`24`
`17`	`25`	`return content;`
`18`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`public sealed class Product`
`4`	`4`	`{`
`5`	`5`	`public string Name;`
	`6`	`+ public string Description;`
`6`	`7`	`public double Price;`
`7`	`8`	`}`
`8`	`9`	`}`