mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Ensure argv on Windows is nullptr-terminated (#18331)

Browse Source
This commit is contained in:
Silent
2022-10-14 09:31:55 +02:00
committed by GitHub
parent 29762188b4
commit db6af4b362
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-win/openrct2-win.cpp
View File

@@ -40,8 +40,10 @@ int wmain(int argc, wchar_t** argvW, [[maybe_unused]] wchar_t* envp)
std::vector<const char*> argv;
std::transform(
argvStrings.begin(), argvStrings.end(), std::back_inserter(argv), [](const auto& string) { return string.c_str(); });
auto exitCode = NormalisedMain(argc, argv.data());
return exitCode;
// Ensure that argv[argc] == nullptr, as mandated by the standard
argv.push_back(nullptr);
return NormalisedMain(argc, argv.data());
}
static std::vector<std::string> GetCommandLineArgs(int argc, wchar_t** argvW)