From 2cae81fe9d9457c395996e6f27db0d81e250e4f2 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 12 Mar 2020 21:25:18 -0400
Subject: Avoid infinite loops when resolving variables.

---
 src/WixToolset.Core/VariableResolver.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/WixToolset.Core/VariableResolver.cs')

diff --git a/src/WixToolset.Core/VariableResolver.cs b/src/WixToolset.Core/VariableResolver.cs
index 0a7916a3..4a65bec2 100644
--- a/src/WixToolset.Core/VariableResolver.cs
+++ b/src/WixToolset.Core/VariableResolver.cs
@@ -94,7 +94,7 @@ namespace WixToolset.Core
             result.IsDefault = true;
             result.Value = value;
 
-            while (!result.DelayedResolve && matches.Count > 0)
+            while (!this.Messaging.EncounteredError && !result.DelayedResolve && matches.Count > 0)
             {
                 var sb = new StringBuilder(value);
 
-- 
cgit v1.2.3-55-g6feb