ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use xe::to_wstring for converting arguments back to wide strings on Windows (xe::to_wstring assumes input is valid UTF-8, which the arguments are not). Fixes #703.

This commit is contained in:
gibbed 2017-05-14 16:29:45 -05:00
parent 1e9786eae3
commit dab3a2e426
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,8 @@ int Main() {
int argca = argc; int argca = argc;
char** argva = reinterpret_cast<char**>(alloca(sizeof(char*) * argca)); char** argva = reinterpret_cast<char**>(alloca(sizeof(char*) * argca));
for (int n = 0; n < argca; n++) { for (int n = 0; n < argca; n++) {
size_t len = wcslen(argv[n]); size_t len = std::wcstombs(nullptr, argv[n], 0);
argva[n] = reinterpret_cast<char*>(alloca(len + 1)); argva[n] = reinterpret_cast<char*>(alloca(sizeof(char) * (len + 1)));
std::wcstombs(argva[n], argv[n], len + 1); std::wcstombs(argva[n], argv[n], len + 1);
} }
@ -83,7 +83,11 @@ int Main() {
// Widen all remaining flags and convert to usable strings. // Widen all remaining flags and convert to usable strings.
std::vector<std::wstring> args; std::vector<std::wstring> args;
for (int n = 0; n < argc; n++) { for (int n = 0; n < argc; n++) {
args.push_back(xe::to_wstring(argva[n])); size_t len = std::mbstowcs(nullptr, argva[n], 0);
auto argvw =
reinterpret_cast<wchar_t*>(alloca(sizeof(wchar_t) * (len + 1)));
std::mbstowcs(argvw, argva[n], len + 1);
args.push_back(std::wstring(argvw));
} }
// Setup COM on the main thread. // Setup COM on the main thread.