Check if requested property exists for Where and Order expressions

mrxten · Nov 27, 2018 · 77827e6 · 77827e6
1 parent 17d1360
commit 77827e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/QueryDesignerCore/Expressions/OrderExpression.cs b/src/QueryDesignerCore/Expressions/OrderExpression.cs
@@ -94,6 +94,12 @@ public static IOrderedQueryable<T> GetOrderedQueryable<T>(this OrderFilter filte
         private static PropertyInfo GetDeclaringProperty(Type t, string name)
         {
             var p = t.GetRuntimeProperty(name);
+
+            if (p == null)
+            {
+                throw new InvalidOperationException(string.Format("Property '{0}' not found on type '{1}'", name, t));
+            }
+
             if (t != p.DeclaringType)
             {
                 p = p.DeclaringType.GetRuntimeProperty(name);

diff --git a/src/QueryDesignerCore/Expressions/WhereExpression.cs b/src/QueryDesignerCore/Expressions/WhereExpression.cs
@@ -420,6 +420,12 @@ private static PropertyInfo GetDeclaringProperty(Expression e, string name)
         {
             var t = e.Type;
             var p = t.GetRuntimeProperty(name);
+
+            if (p == null)
+            {
+                throw new InvalidOperationException(string.Format("Property '{0}' not found on type '{1}'", name, t));
+            }
+
             if (t != p.DeclaringType)
             {
                 p = p.DeclaringType.GetRuntimeProperty(name);