From 8016c4dd39fe1f8816c968952a2aac5a98c09560 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 1 May 2023 21:09:14 -0400
Subject: Tame some wild pointers.

Maybe Rust wouldn't be so bad...

Fixes https://github.com/wixtoolset/issues/issues/7451.
---
 src/burn/engine/bundlepackageengine.cpp                    |  8 ++++----
 src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/burn/engine/bundlepackageengine.cpp b/src/burn/engine/bundlepackageengine.cpp
index 95f5acbc..61911fb4 100644
--- a/src/burn/engine/bundlepackageengine.cpp
+++ b/src/burn/engine/bundlepackageengine.cpp
@@ -151,7 +151,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczDetectCodes), *pcDetectCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Detect code array");
 
-            *prgsczDetectCodes[*pcDetectCodes] = sczId;
+            (*prgsczDetectCodes)[*pcDetectCodes] = sczId;
             sczId = NULL;
             *pcDetectCodes += 1;
         }
@@ -160,7 +160,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczUpgradeCodes), *pcUpgradeCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Upgrade code array");
 
-            *prgsczUpgradeCodes[*pcUpgradeCodes] = sczId;
+            (*prgsczUpgradeCodes)[*pcUpgradeCodes] = sczId;
             sczId = NULL;
             *pcUpgradeCodes += 1;
         }
@@ -169,7 +169,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczAddonCodes), *pcAddonCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Addon code array");
 
-            *prgsczAddonCodes[*pcAddonCodes] = sczId;
+            (*prgsczAddonCodes)[*pcAddonCodes] = sczId;
             sczId = NULL;
             *pcAddonCodes += 1;
         }
@@ -178,7 +178,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczPatchCodes), *pcPatchCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Patch code array");
 
-            *prgsczPatchCodes[*pcPatchCodes] = sczId;
+            (*prgsczPatchCodes)[*pcPatchCodes] = sczId;
             sczId = NULL;
             *pcPatchCodes += 1;
         }
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
index 4fb1fd43..cfeda6c4 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
@@ -3,7 +3,18 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
+    <RelatedBundle Id="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Id="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Id="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Id="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Id="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Id="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Id="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Id="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Id="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Id="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Id="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Id="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-- 
cgit v1.2.3-55-g6feb