From b72f58abdf6dd5d0020f174358027158cb52cb72 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 19 Aug 2022 14:08:23 -0500
Subject: Use a dedicated pipe for redirecting logging from the elevated
 process.

Fixes 6869
---
 src/libs/dutil/WixToolset.DUtil/logutil.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/libs')

diff --git a/src/libs/dutil/WixToolset.DUtil/logutil.cpp b/src/libs/dutil/WixToolset.DUtil/logutil.cpp
index 3a130b4e..1453d1d2 100644
--- a/src/libs/dutil/WixToolset.DUtil/logutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/logutil.cpp
@@ -222,8 +222,12 @@ void DAPI LogRedirect(
     __in_opt LPVOID pvContext
     )
 {
+    ::EnterCriticalSection(&LogUtil_csLog);
+
     s_vpfLogStringWorkRaw = vpfLogStringWorkRaw;
     s_vpvLogStringWorkRawContext = pvContext;
+
+    ::LeaveCriticalSection(&LogUtil_csLog);
 }
 
 
-- 
cgit v1.2.3-55-g6feb