From db6af4b3622be31e9ad55b44dc5715b1f3295ebf Mon Sep 17 00:00:00 2001
From: Silent <CookiePLMonster@users.noreply.github.com>
Date: Fri, 14 Oct 2022 09:31:55 +0200
Subject: [PATCH] Ensure argv on Windows is nullptr-terminated (#18331)

---
 src/openrct2-win/openrct2-win.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/openrct2-win/openrct2-win.cpp b/src/openrct2-win/openrct2-win.cpp
index 018617bdfc..ea586c4f00 100644
--- a/src/openrct2-win/openrct2-win.cpp
+++ b/src/openrct2-win/openrct2-win.cpp
@@ -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)