From 7e434932aefe6bf7105cc5ad58c671f70e85782d Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 4 Dec 2022 18:21:18 +0100 Subject: [PATCH] Fix Development build issue with Flax.Build running in Development mode --- Source/Engine/Platform/Windows/WindowsPlatform.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Engine/Platform/Windows/WindowsPlatform.cpp b/Source/Engine/Platform/Windows/WindowsPlatform.cpp index 1e4337016..56d84cd9c 100644 --- a/Source/Engine/Platform/Windows/WindowsPlatform.cpp +++ b/Source/Engine/Platform/Windows/WindowsPlatform.cpp @@ -1079,7 +1079,6 @@ int32 WindowsPlatform::RunProcess(const StringView& cmdLine, const StringView& w HANDLE stdOutRead = nullptr; HANDLE stdErrRead = nullptr; - Array attributeList; if (captureStdOut) { @@ -1101,8 +1100,7 @@ int32 WindowsPlatform::RunProcess(const StringView& cmdLine, const StringView& w SIZE_T bufferSize = 0; if (!InitializeProcThreadAttributeList(nullptr, 1, 0, &bufferSize) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - attributeList.Resize((int32)bufferSize); - startupInfoEx.lpAttributeList = (LPPROC_THREAD_ATTRIBUTE_LIST)attributeList.Get(); + startupInfoEx.lpAttributeList = (LPPROC_THREAD_ATTRIBUTE_LIST)Allocator::Allocate(bufferSize); if (!InitializeProcThreadAttributeList(startupInfoEx.lpAttributeList, 1, 0, &bufferSize)) { LOG(Warning, "InitializeProcThreadAttributeList failed"); @@ -1126,9 +1124,6 @@ int32 WindowsPlatform::RunProcess(const StringView& cmdLine, const StringView& w goto ERROR_EXIT; } - if (environmentStr) - Allocator::Free(environmentStr); - if (stdOutRead != nullptr) { // Keep reading std output and std error streams until process is running @@ -1177,6 +1172,10 @@ ERROR_EXIT: { DeleteProcThreadAttributeList(startupInfoEx.lpAttributeList); } + if (environmentStr) + Allocator::Free(environmentStr); + if (startupInfoEx.lpAttributeList) + Allocator::Free(startupInfoEx.lpAttributeList); return result; }