From 6abbe430fe26146e8faeeee0573843cc79dddee0 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Tue, 13 Jun 2023 07:23:08 +0200 Subject: Make sure GetEnvVariable can handle values that are longer than 1023 characters (#332) --- src/zencore/filesystem.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src/zencore/filesystem.cpp') diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp index 9d55331eb..cde4c52ab 100644 --- a/src/zencore/filesystem.cpp +++ b/src/zencore/filesystem.cpp @@ -1144,11 +1144,25 @@ GetEnvVariable(std::string_view VariableName) ZEN_ASSERT(!VariableName.empty()); #if ZEN_PLATFORM_WINDOWS - CHAR EnvVariableBuffer[1023 + 1]; - DWORD RESULT = GetEnvironmentVariableA(std::string(VariableName).c_str(), EnvVariableBuffer, sizeof(EnvVariableBuffer)); - if (RESULT > 0 && RESULT < sizeof(EnvVariableBuffer)) + std::vector EnvVariableBuffer(1023 + 1); + DWORD RESULT = GetEnvironmentVariableA(std::string(VariableName).c_str(), EnvVariableBuffer.data(), (DWORD)EnvVariableBuffer.size()); + if (RESULT == 0) { - return std::string(EnvVariableBuffer); + return ""; + } + if (RESULT <= EnvVariableBuffer.size()) + { + return std::string(EnvVariableBuffer.data(), size_t(RESULT)); + } + EnvVariableBuffer.resize(size_t(RESULT)); + RESULT = GetEnvironmentVariableA(std::string(VariableName).c_str(), EnvVariableBuffer.data(), (DWORD)EnvVariableBuffer.size()); + if (RESULT == 0) + { + return ""; + } + if (RESULT <= EnvVariableBuffer.size()) + { + return std::string(EnvVariableBuffer.data(), size_t(RESULT)); } #endif #if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC -- cgit v1.2.3