Exclude throwing subexpr's from partial evaluation

devlooped · Jun 24, 2020 · 6812e06 · 6812e06
1 parent a05c885
commit 6812e06
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Moq/Evaluator.cs b/src/Moq/Evaluator.cs
@@ -109,7 +109,17 @@ public override Expression Visit(Expression expression)
 					base.Visit(expression);
 					if (!this.cannotBeEvaluated)
 					{
-						if (this.fnCanBeEvaluated(expression))
+						bool canBeEvaluated;
+						try
+						{
+							canBeEvaluated = this.fnCanBeEvaluated(expression);
+						}
+						catch
+						{
+							canBeEvaluated = false;
+						}
+
+						if (canBeEvaluated)
 						{
 							this.candidates.Add(expression);
 						}