Use a dedicated pipe for redirecting logging from the elevated process.

Fixes 6869

1 files changed, 4 insertions, 0 deletions

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);
 }