From c37f29a156a84e27e6b38a7841e2ddcde015b071 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 17 Jul 2020 10:42:30 -0700 Subject: Fix parsing of bind variables with default values --- src/WixToolset.Core/Common.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Core/Common.cs') diff --git a/src/WixToolset.Core/Common.cs b/src/WixToolset.Core/Common.cs index 1a748a13..6efc7571 100644 --- a/src/WixToolset.Core/Common.cs +++ b/src/WixToolset.Core/Common.cs @@ -788,9 +788,9 @@ namespace WixToolset.Core string scope = null; string defaultValue = null; - var secondDot = value.IndexOf('.', firstDot + 1, closeParen - firstDot); var equalsDefaultValue = value.IndexOf('=', firstDot + 1, closeParen - firstDot); var end = equalsDefaultValue == -1 ? closeParen : equalsDefaultValue; + var secondDot = value.IndexOf('.', firstDot + 1, end - firstDot); if (secondDot == -1) { @@ -814,7 +814,7 @@ namespace WixToolset.Core if (equalsDefaultValue != -1 && equalsDefaultValue < closeParen) { - defaultValue = value.Substring(equalsDefaultValue + 1, end - equalsDefaultValue - 1); + defaultValue = value.Substring(equalsDefaultValue + 1, closeParen - equalsDefaultValue - 1); } parsedVariable = new ParsedWixVariable -- cgit v1.2.3-55-g6feb