diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-03-24 11:43:06 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-03-24 14:14:23 -0700 |
| commit | 035eccfb7400a8e6099e239b2b39116d95ddfb9f (patch) | |
| tree | 6348048d2570693af4edc3b2fbc0968b8adb85ae /src | |
| parent | 38fe36a2072b1abde87b52643e43a3d7ddf2a2f5 (diff) | |
| download | wix-035eccfb7400a8e6099e239b2b39116d95ddfb9f.tar.gz wix-035eccfb7400a8e6099e239b2b39116d95ddfb9f.tar.bz2 wix-035eccfb7400a8e6099e239b2b39116d95ddfb9f.zip | |
File and folder names that start with dots are not valid short names
Fixes 7313
Diffstat (limited to 'src')
3 files changed, 3 insertions, 1 deletions
diff --git a/src/wix/WixToolset.Core/Common.cs b/src/wix/WixToolset.Core/Common.cs index 2a054fa9..bcaa25af 100644 --- a/src/wix/WixToolset.Core/Common.cs +++ b/src/wix/WixToolset.Core/Common.cs | |||
| @@ -249,7 +249,7 @@ namespace WixToolset.Core | |||
| 249 | { | 249 | { |
| 250 | return filename.Length < 9; | 250 | return filename.Length < 9; |
| 251 | } | 251 | } |
| 252 | else if (expectedDot > 8 || filename[expectedDot] != '.' || expectedDot + 4 < filename.Length) | 252 | else if (expectedDot == 0 || expectedDot > 8 || filename[expectedDot] != '.' || expectedDot + 4 < filename.Length) |
| 253 | { | 253 | { |
| 254 | return false; | 254 | return false; |
| 255 | } | 255 | } |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 52bf9d29..006610d1 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | |||
| @@ -282,6 +282,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 282 | "Directory:Folder12\tINSTALLFOLDER\tFolder.12", | 282 | "Directory:Folder12\tINSTALLFOLDER\tFolder.12", |
| 283 | "Directory:Folder123\tINSTALLFOLDER\tFolder.123", | 283 | "Directory:Folder123\tINSTALLFOLDER\tFolder.123", |
| 284 | "Directory:Folder1234\tINSTALLFOLDER\tyakwclwy|Folder.1234", | 284 | "Directory:Folder1234\tINSTALLFOLDER\tyakwclwy|Folder.1234", |
| 285 | "Directory:GitFolder\tINSTALLFOLDER\t69sdfw2d|.git", | ||
| 285 | "Directory:INSTALLFOLDER\tProgramFiles6432Folder\t1egc1laj|MsiPackage", | 286 | "Directory:INSTALLFOLDER\tProgramFiles6432Folder\t1egc1laj|MsiPackage", |
| 286 | "Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName", | 287 | "Directory:NAMEANDSHORTNAME\tINSTALLFOLDER\tSHORTNAM|NameAndShortName", |
| 287 | "Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName", | 288 | "Directory:NAMEANDSHORTSOURCENAME\tINSTALLFOLDER\tNAMEASSN|NameAndShortSourceName", |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs index 2f277956..298b6c54 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultDir/DefaultDir.wxs | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | <Directory Id="Folder12" Name="Folder.12"></Directory> | 21 | <Directory Id="Folder12" Name="Folder.12"></Directory> |
| 22 | <Directory Id="Folder123" Name="Folder.123"></Directory> | 22 | <Directory Id="Folder123" Name="Folder.123"></Directory> |
| 23 | <Directory Id="Folder1234" Name="Folder.1234"></Directory> | 23 | <Directory Id="Folder1234" Name="Folder.1234"></Directory> |
| 24 | <Directory Id="GitFolder" Name=".git"></Directory> | ||
| 24 | </DirectoryRef> | 25 | </DirectoryRef> |
| 25 | </Fragment> | 26 | </Fragment> |
| 26 | </Wix> | 27 | </Wix> |