Ensure directory keypaths cannot be used to generate GUIDs
Rob Mensching committed
Jan 9, 2021 at 02:05 UTC
0fcb0cb1d0a2f741f83feb76bc276926f499686d
1 file changed
+2
-3
src/WixToolset.Core/Compiler.cs
+2
-3
@@ -2467,13 +2467,12 @@ namespace WixToolset.Core
2467
var isGeneratableGuidOk = "*" == guid;
2468
if (isGeneratableGuidOk)
2469
{
2470
- if (encounteredODBCDataSource)
2470
+ if (encounteredODBCDataSource || ComponentKeyPathType.Directory == keyPathType)
2471
{
2472
this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers));
2473
isGeneratableGuidOk = false;
2474
}
2475
-
2476
- if (0 < files && ComponentKeyPathType.Registry == keyPathType)
2475
+ else if (0 < files && ComponentKeyPathType.Registry == keyPathType)
2476
{
2477
this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers, true));
2478
isGeneratableGuidOk = false;