Fix check for valid 8.3 names for >3 extensions.
Bob Arnson committed
Sep 1, 2020 at 18:31 UTC
e1ff7245ee176c18bd0b773a7e11df6bb95d7b7e
3 files changed
+9
-1
src/WixToolset.Core/Common.cs
+1
-1
@@ -253,7 +253,7 @@ namespace WixToolset.Core
253
{
254
return filename.Length < 9;
255
}
256
- else if (expectedDot > 8 || filename[expectedDot] != '.')
256
+ else if (expectedDot > 8 || filename[expectedDot] != '.' || expectedDot + 4 < filename.Length)
257
{
258
return false;
259
}
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+4
@@ -371,6 +371,10 @@ namespace WixToolsetTest.CoreIntegration
371
WixAssert.CompareLineByLine(new[]
372
{
373
"Directory:DUPLICATENAMEANDSHORTNAME\tINSTALLFOLDER\tduplicat",
374
+ "Directory:Folder1\tINSTALLFOLDER\tFolder.1",
375
+ "Directory:Folder12\tINSTALLFOLDER\tFolder.12",
376
+ "Directory:Folder123\tINSTALLFOLDER\tFolder.123",
377
+ "Directory:Folder1234\tINSTALLFOLDER\tyakwclwy|Folder.1234",
378
"Directory:INSTALLFOLDER\tProgramFiles6432Folder\t1egc1laj|MsiPackage",
379
"Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName",
380
"Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName",
src/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs
+4
@@ -17,6 +17,10 @@
17
<Directory Id="NAMEANDSHORTSOURCENAME" Name="NameAndShortSourceName" ShortName="NAMEASSN"></Directory>
18
<Directory Id="SHORTNAMEANDLONGSOURCENAME" SourceName="ShortNameAndLongSourceName" Name="SHNALSNM"></Directory>
19
<Directory Id="SOURCENAMEWITHSHORTVALUE" SourceName="SRTSRCVL"></Directory>
20
+ <Directory Id="Folder1" Name="Folder.1"></Directory>
21
+ <Directory Id="Folder12" Name="Folder.12"></Directory>
22
+ <Directory Id="Folder123" Name="Folder.123"></Directory>
23
+ <Directory Id="Folder1234" Name="Folder.1234"></Directory>
24
</DirectoryRef>
25
</Fragment>
26
</Wix>