Fix check for valid 8.3 names for >3 extensions.

3 files changed, 9 insertions, 1 deletions

diff --git a/src/WixToolset.Core/Common.cs b/src/WixToolset.Core/Common.cs
index 6efc7571..1bb895be 100644
--- a/src/WixToolset.Core/Common.cs
+++ b/src/WixToolset.Core/Common.cs
@@ -253,7 +253,7 @@ namespace WixToolset.Core
                 {
                     return filename.Length < 9;
                 }
-                else if (expectedDot > 8 || filename[expectedDot] != '.')
+                else if (expectedDot > 8 || filename[expectedDot] != '.' || expectedDot + 4 < filename.Length)
                 {
                     return false;
                 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 158687cf..f5353c87 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -371,6 +371,10 @@ namespace WixToolsetTest.CoreIntegration
                 WixAssert.CompareLineByLine(new[]
                 {
                     "Directory:DUPLICATENAMEANDSHORTNAME\tINSTALLFOLDER\tduplicat",
+                    "Directory:Folder1\tINSTALLFOLDER\tFolder.1",
+                    "Directory:Folder12\tINSTALLFOLDER\tFolder.12",
+                    "Directory:Folder123\tINSTALLFOLDER\tFolder.123",
+                    "Directory:Folder1234\tINSTALLFOLDER\tyakwclwy|Folder.1234",
                     "Directory:INSTALLFOLDER\tProgramFiles6432Folder\t1egc1laj|MsiPackage",
                     "Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName",
                     "Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName",
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
index a217fa34..2f277956 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
@@ -17,6 +17,10 @@
             <Directory Id="NAMEANDSHORTSOURCENAME" Name="NameAndShortSourceName" ShortName="NAMEASSN"></Directory>
             <Directory Id="SHORTNAMEANDLONGSOURCENAME" SourceName="ShortNameAndLongSourceName" Name="SHNALSNM"></Directory>
             <Directory Id="SOURCENAMEWITHSHORTVALUE" SourceName="SRTSRCVL"></Directory>
+            <Directory Id="Folder1" Name="Folder.1"></Directory>
+            <Directory Id="Folder12" Name="Folder.12"></Directory>
+            <Directory Id="Folder123" Name="Folder.123"></Directory>
+            <Directory Id="Folder1234" Name="Folder.1234"></Directory>
         </DirectoryRef>
     </Fragment>
 </Wix>