From aecb3534fcc640b2e035d6138de2bccc05653f8e Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 22 Oct 2020 12:57:53 +0800
Subject: [PATCH] Prevent ReflectionHelper's GetValueByPath method use null
 values.

Fix #5619
---
 .../Volo/Abp/Reflection/ReflectionHelper.cs   | 16 ++++--
 .../Abp/Reflection/ReflectionHelper_Tests.cs  | 49 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs
index fd47d8b859..132c198aa9 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs
@@ -124,7 +124,7 @@ namespace Volo.Abp.Reflection
                 ? customAttributes.Concat(declaringTypeCustomAttributes).Distinct()
                 : customAttributes;
         }
-        
+
         /// <summary>
         /// Gets value of a property by it's full path from given object
         /// </summary>
@@ -134,7 +134,7 @@ namespace Volo.Abp.Reflection
             var currentType = objectType;
             var objectPath = currentType.FullName;
             var absolutePropertyPath = propertyPath;
-            if (absolutePropertyPath.StartsWith(objectPath))
+             if (objectPath != null && absolutePropertyPath.StartsWith(objectPath))
             {
                 absolutePropertyPath = absolutePropertyPath.Replace(objectPath + ".", "");
             }
@@ -142,8 +142,16 @@ namespace Volo.Abp.Reflection
             foreach (var propertyName in absolutePropertyPath.Split('.'))
             {
                 var property = currentType.GetProperty(propertyName);
-                value = property.GetValue(value, null);
-                currentType = property.PropertyType;
+                if (property != null)
+                {
+                    value = property.GetValue(value, null);
+                    currentType = property.PropertyType;
+                }
+                else
+                {
+                    value = null;
+                    break;
+                }
             }
 
             return value;
diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs
index 333ea2e84a..9a621d3e01 100644
--- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Shouldly;
 using Xunit;
 
@@ -8,6 +9,50 @@ namespace Volo.Abp.Reflection
     {
         //TODO: ...
 
+        class GetValueByPathTestClass
+        {
+            public string Name { get; set; }
+
+            public int Count { get; set; }
+
+            public DateTime Time { get; set; }
+
+            public GetValueByPathTestChildrenClass Children { get; set; }
+        }
+
+        class GetValueByPathTestChildrenClass
+        {
+            public string Name { get; set; }
+
+            public int Count { get; set; }
+        }
+
+        [Fact]
+        public void GetValueByPath_Test()
+        {
+            var value = new GetValueByPathTestClass
+            {
+                Name = "test",
+                Count = 8,
+                Time = DateTime.Parse("2020-01-01"),
+                Children = new GetValueByPathTestChildrenClass
+                {
+                    Name = "test-children",
+                    Count = 9,
+                }
+            };
+
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Name").ShouldBe("test");
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Volo.Abp.Reflection.ReflectionHelper_Tests+GetValueByPathTestClass.Name").ShouldBe("test");
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Count").ShouldBe(8);
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Time").ShouldBe(DateTime.Parse("2020-01-01"));
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Children.Name").ShouldBe("test-children");
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Children.Count").ShouldBe(9);
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Volo.Abp.Reflection.ReflectionHelper_Tests+GetValueByPathTestClass.Children.Name").ShouldBe("test-children");
+
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "Children.NotExist").ShouldBeNull();
+            ReflectionHelper.GetValueByPath(value, value.GetType(), "NotExist").ShouldBeNull();
+        }
 
         [Fact]
         public void GetPublicConstantsRecursively_Test()
@@ -99,4 +144,4 @@ namespace Volo.Abp.Reflection
         }
     }
 
-}
\ No newline at end of file
+}