aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-10-14 14:48:50 -0700
committerRob Mensching <rob@firegiant.com>2019-10-14 14:52:16 -0700
commit5ee3e62691e09ffd3edc9bfafa4deddb26f155c5 (patch)
tree29d7c69a342a27d9bdb22cc959c05b03c2d5ba50 /src/WixToolset.Core
parent6aa87076310c0ad2cb92cabcf2e8bc83c22970be (diff)
downloadwix-5ee3e62691e09ffd3edc9bfafa4deddb26f155c5.tar.gz
wix-5ee3e62691e09ffd3edc9bfafa4deddb26f155c5.tar.bz2
wix-5ee3e62691e09ffd3edc9bfafa4deddb26f155c5.zip
Fix lock permissions
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/Compiler_2.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 445e8dfa..7eeb2e2e 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -1053,7 +1053,6 @@ namespace WixToolset.Core
1053 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); 1053 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
1054 var bits = new BitArray(32); 1054 var bits = new BitArray(32);
1055 string domain = null; 1055 string domain = null;
1056 var permission = 0;
1057 string[] specialPermissions = null; 1056 string[] specialPermissions = null;
1058 string user = null; 1057 string user = null;
1059 1058
@@ -1115,13 +1114,13 @@ namespace WixToolset.Core
1115 } 1114 }
1116 } 1115 }
1117 1116
1118 permission = this.Core.CreateIntegerFromBitArray(bits);
1119
1120 if (null == user) 1117 if (null == user)
1121 { 1118 {
1122 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "User")); 1119 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "User"));
1123 } 1120 }
1124 1121
1122 var permission = this.Core.CreateIntegerFromBitArray(bits);
1123
1125 if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL 1124 if (Int32.MinValue == permission) // just GENERIC_READ, which is MSI_NULL
1126 { 1125 {
1127 this.Core.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers)); 1126 this.Core.Write(ErrorMessages.GenericReadNotAllowed(sourceLineNumbers));