3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 00:14:07 +08:00
Code Issues Projects Releases Wiki Activity

Fix problem with wchar_t* to std::string conversion. (#419)

Browse Source 
VS2019 correctly points out that a conversion from a wide NTCS to std::string requires narrowing. This may result in an undesired string value. Implement the string conversion properly.

Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert 2019-01-27 23:08:01 +01:00 committed by Howard Hinnant
parent 4e7e76b981
commit 61c3d35634
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tz.cpp
View File

@ -98,6 +98,7 @@
#include <cctype>
#include <cstdlib>
#include <cstring>
#include <cwchar>
#include <exception>
#include <fstream>
#include <iostream>
@ -208,7 +209,14 @@ get_known_folder(const GUID& folderid)
if (SUCCEEDED(hr))
{
co_task_mem_ptr folder_ptr(pfolder);
folder = std::string(folder_ptr.get(), folder_ptr.get() + wcslen(folder_ptr.get()));
const wchar_t* fptr = folder_ptr.get();
auto state = std::mbstate_t();
const auto required = std::wcsrtombs(nullptr, &fptr, 0, &state);
if (required != 0 && required != -1)
{
folder.resize(required);
std::wcsrtombs(folder.data(), &fptr, folder.size(), &state);
}
}
return folder;
}