From b62127f2f458d15ca22ff2a5398f5ed80c72a6a6 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 27 Feb 2024 18:17:33 -0500
Subject: [PATCH] Decompile null Message column in Error table.

---
 .../Decompile/Decompiler.cs                   |   2 +-
 .../TestData/Decompile/ExpectedUI.wxs         |   1 +
 .../TestData/Decompile/ui.msi                 | Bin 290816 -> 290816 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index e3609b307..788e87b89 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -4506,7 +4506,7 @@ private void DecompileErrorTable(Table table)
             {
                 var xError = new XElement(Names.ErrorElement,
                     new XAttribute("Id", row.FieldAsString(0)),
-                    new XAttribute("Message", row.FieldAsString(1)));
+                    row.IsColumnNull(1) ? null : new XAttribute("Message", row.FieldAsString(1)));
 
                 this.UIElement.Add(xError);
             }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
index 38aa2e7aa..7c90971a3 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
@@ -542,6 +542,7 @@
     </UI>
     <CustomAction Id="WixUIValidatePath" Return="ignore" BinaryRef="WixUIWixca" DllEntry="ValidatePath" />
     <CustomAction Id="WixUIPrintEula" Return="ignore" BinaryRef="WixUIWixca" DllEntry="PrintEula" />
+    <Error Id="123" />
     <Feature Id="ProductFeature" Title="ui" Level="1">
       <ComponentRef Id="ProductComponent" />
     </Feature>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi
index 230cdb5d60a4fc56bebc6ac117f9ab71db482b88..4dea2b882c050a30af7d1d18c26ebb857cbe7683 100644
GIT binary patch
delta 488
zcmYk3Pe@cz6vprQ^JXSToS76g(0DaUgGEM-5Ygf?I21`X(6)ubNCbg0wn$yf&_Y^<
z7rcvvT4b%P;L+R(T0CgeqJ@M(^aqEjMXPj?Pz2g}LDUBym+yBE=UmRMH8Ztl=IM36
zqdC2F@YS{VKuT0J^Zq;}gB|}8di?^r%-XpgJJF)v;AZwUc|F1~VkV7U!Hpy9=<SIH
z|DmB0a7?P~_Alr*DeMluAKk$J((xRC3HnbABRi=JN+-*Z*p((*lFW-!nxn9k&;2>g
zv3#G`2}<n-hcZF(mR{7bsIjgoEZcC6bbXb=MEx;^V8ad4kHRN3Sbs|^v8=RHo?;bO
zpxVUy#R+kTc%L|}z(AqXz4<^f;089(z57VLKu|-s^@$Ed@HyJVCjD5}>@%*adv1G^
zE~9zrkH8r_*P;tC$jO|6zYFlbNt&@gTU3RwcJ4D(Q{@RkB7J_m_-u5<WDXC@_S%fj
z<~@0aVgop~e4pCg`WL!A)?TbsrYjexW@jg_PPuZLS5mxCQ_8XCvuMKy)Mu|0c);oc
dpN=<Bspzs=;2ntjcke`>=@v%0n0#1b|2HOKnP30_

delta 392
zcmYL_KS)AR7{%XrzpF`4$_GLX3b#~>ihBJS8X7KU1TNL)5adu>TM^WfL`2Zmh3?YO
z(7z=V9(aR-9^@F|;1XGhHD^PDE!wl7rjPSG95~-em5fx$$Skuq-`?`l-1Y;YrfGIe
zY_JVzwW@4}h#WJC(5$u4J-Wh<OT@)=hwu@<wc3*>F1Lds|EO;kM6TPkKKly<{D1s&
zuopmCL34<Rn(4I?BlF;SccS%1qam(GIn_YZ_Q!gu?p!f27J$0dWhi}%?{L`RB+JoW
zlsrlUa%F*rvnObKq<xHB*%xTTnVrUnOr@K;fQN2bJjRH?sG;^B(G9XxM8C=uk%GE>
z!cLHdXRKvQI7!?PbZT_`G);y&VO*}4F)nV|u&d%2N%>XAO(@FsSKK6tqyQ2>I6|+=
zzoDr+GsJ#X1$Vhh_~?1Nyn8{W7^jTLRFsalG+)y-P&ZLpg_e(rpP|)Nj7~N4{B)MG
EZvl#hO8@`>