From fafa036c37313a87afdb9f4ca8bb515aa7733c0c Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 21 Dec 2014 12:48:03 +0000 Subject: [PATCH] Fix wchar_t to char conversion in renderdoccmd on win32 --- renderdoccmd/renderdoccmd_win32.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renderdoccmd/renderdoccmd_win32.cpp b/renderdoccmd/renderdoccmd_win32.cpp index 68300bf7b..de7ff60bf 100644 --- a/renderdoccmd/renderdoccmd_win32.cpp +++ b/renderdoccmd/renderdoccmd_win32.cpp @@ -265,8 +265,9 @@ int WINAPI wWinMain(_In_ HINSTANCE hInst, for(int i=0; i < argc; i++) { size_t len = wcslen(wargv[i]); - argv[i] = new char[len*4 + 1]; - argv[i][len*4] = 0; + len *= 4; // worst case, every UTF-8 character takes 4 bytes + argv[i] = new char[len + 1]; + argv[i][len] = 0; WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, &argv[i][0], (int)len+1, NULL, NULL); }