xenia-project/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2026-02-08 08:44:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[BASE] Prevent crashing if special characters are in the launch path

Browse source 
A path containing characters which cannot be converted to a multibyte string would fail and cause cxxopts to assign the cvar target to argument 0
This commit is contained in:
Adrian 2023-07-08 18:21:40 +01:00
parent 00aba94b98
commit 0957b8725f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xenia/base/main_win.cc
View file

@ -96,8 +96,14 @@ bool ParseWin32LaunchArguments(
char** argv = reinterpret_cast<char**>(alloca(sizeof(char*) * argc));
for (int n = 0; n < argc; n++) {
size_t len = std::wcstombs(nullptr, wargv[n], 0);
argv[n] = reinterpret_cast<char*>(alloca(sizeof(char) * (len + 1)));
std::wcstombs(argv[n], wargv[n], len + 1);
if (len != -1) {
argv[n] = reinterpret_cast<char*>(alloca(sizeof(char) * (len + 1)));
std::wcstombs(argv[n], wargv[n], len + 1);
} else {
// Prevent cxxopts from indexing out of bounds.
argc--;
}
}
LocalFree(wargv);