Added type conversion null ref fix

ChilliCream · Apr 6, 2020 · 68c39a8 · 68c39a8
1 parent e2e8957
commit 68c39a8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Core/Types/Utilities/TypeConversion.cs b/src/Core/Types/Utilities/TypeConversion.cs
@@ -61,12 +61,20 @@ public object Convert(Type from, Type to, object source)
                 throw new ArgumentNullException(nameof(to));
             }
 
-            if (source is null || from == to)
+            if (from == to)
             {
                 converted = source;
                 return true;
             }
 
+            if (source is null)
+            {
+                converted = to.IsValueType
+                    ? Activator.CreateInstance(to)
+                    : null;
+                return true;
+            }
+
             try
             {
                 Type fromInternal = (from == typeof(object) && source != null)