From c37f29a156a84e27e6b38a7841e2ddcde015b071 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 17 Jul 2020 10:42:30 -0700
Subject: Fix parsing of bind variables with default values

---
 src/WixToolset.Core/Common.cs                      |  4 +--
 .../BindVariablesFixture.cs                        | 38 ++++++++++++++++++++++
 .../TestData/BindVariables/DefaultedVariable.wxs   |  6 ++++
 .../TestData/BindVariables/data/test.txt           |  1 +
 .../WixToolsetTest.CoreIntegration.csproj          |  2 ++
 5 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt

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
diff --git a/src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs
new file mode 100644
index 00000000..3e9c7aa4
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.CoreIntegration
+{
+    using System;
+    using System.IO;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
+    using Xunit;
+
+    public class BindVariablesFixture
+    {
+        [Fact]
+        public void CanBuildWithDefaultValue()
+        {
+            var folder = TestData.Get(@"TestData\BindVariables");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "DefaultedVariable.wxs"),
+                    "-bf",
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", folder,
+                    "-o", wixlibPath,
+                });
+
+                result.AssertSuccess();
+            }
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs
new file mode 100644
index 00000000..c3528a67
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/DefaultedVariable.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <Binary Id="Bound" SourceFile="!(wix.Test=data\test.txt)" />
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt
new file mode 100644
index 00000000..3b862323
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/data/test.txt
@@ -0,0 +1 @@
+This is test.txt
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 87ace0b9..15078b8a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -23,6 +23,8 @@
     <Content Include="TestData\AppSearch\RegistrySearch.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BadEnsureTable\BadEnsureTable.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BadInput\RegistryKey.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BindVariables\DefaultedVariable.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BindVariables\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BundleCustomTable\BundleCustomTable.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BundleExtension\BundleExtension.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BundleExtension\BundleExtensionSearches.wxs" CopyToOutputDirectory="PreserveNewest" />
-- 
cgit v1.2.3-55-g6feb