Merge pull request #1 from barnson/bug4331

WIXBUG:4331 - guard against null registry keys
wixtoolset · Mar 14, 2014 · 1ab3614 · 1ab3614
2 parents 0eefdf2 + c93b514
commit 1ab3614
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/History.md b/History.md
@@ -1,3 +1,5 @@
+* BobArnson: WIXBUG:4331 - guard against null registry keys
+
 * BobArnson: WIXBUG:4301 - don't cross the HRESULTs and Win32 error codes; it would be bad.
 
 * RobMen: WIXBUG:4228 - send TRUE to WM_ENDSESSION to correctly inform applications to close.

diff --git a/src/ext/UtilExtension/wixext/UtilFinalizeHarvesterMutator.cs b/src/ext/UtilExtension/wixext/UtilFinalizeHarvesterMutator.cs
@@ -263,7 +263,7 @@ private void MutateComponents()
                 // create a COM element for each group
                 foreach (Wix.RegistryValue registryValue in component[typeof(Wix.RegistryValue)])
                 {
-                    if (Wix.RegistryValue.ActionType.write == registryValue.Action && Wix.RegistryRootType.HKCR == registryValue.Root && Wix.RegistryValue.TypeType.@string == registryValue.Type)
+                    if (!String.IsNullOrEmpty(registryValue.Key) && Wix.RegistryValue.ActionType.write == registryValue.Action && Wix.RegistryRootType.HKCR == registryValue.Root && Wix.RegistryValue.TypeType.@string == registryValue.Type)
                     {
                         string index = null;
                         string[] parts = registryValue.Key.Split('\\');