From 527fd3c0faf24b97e22e2b0de9eb66b687ec220b Mon Sep 17 00:00:00 2001
From: "Jason T. Greene" <jason.greene@redhat.com>
Date: Sun, 5 Dec 2021 17:48:31 -0600
Subject: [PATCH] Escape trailing slash in install directory location so the
 closing quote is not escaped

Fixes #11416 [NO NEW TESTS NEEDED]

Signed-off-by: Jason Greene <jason.greene@redhat.com>
---
 contrib/msi/podman.wxs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs
index 4136e2cc4a..aade2afdbb 100644
--- a/contrib/msi/podman.wxs
+++ b/contrib/msi/podman.wxs
@@ -32,7 +32,8 @@
     </Directory>
 
     <Property Id="setx" Value="setx.exe"/>
-    <CustomAction Id="ChangePath" ExeCommand="PATH &quot;%PATH%;[INSTALLDIR]&quot;" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/>
+    <!-- Directory table entries have a trailing slash, so an extra backslash is needed to prevent escaping the quote -->
+    <CustomAction Id="ChangePath" ExeCommand="PATH &quot;%PATH%;[INSTALLDIR]\&quot;" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/>
 
     <Feature Id="Complete" Level="1">
       <ComponentRef Id="INSTALLDIR_Component"/>