Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-11-17 07:48:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an encoding bug on Windows, when trying to convert empty strings

Browse source
This commit is contained in:
Olivier Teulière 2010-01-29 21:46:13 +00:00
parent 16b563f5b2
commit 3093d0fd7c
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dic/encoding.cpp
View file

@ -354,6 +354,10 @@ unsigned int readFromUTF8(wchar_t *oString, unsigned int iWideSize,
const string &iContext)
{
#ifdef WIN32
if (iBuffer == NULL || *iBuffer == '\0')
{
return 0;
}
int res = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, iBuffer,
iBufSize, oString, iWideSize);
if (res == 0)
@ -414,6 +418,11 @@ unsigned int writeInUTF8(const wstring &iWString, char *oBuffer,
unsigned int iBufSize, const string &iContext)
{
#ifdef WIN32
if (iWString.empty())
{
*oBuffer = '\0';
return 0;
}
int res = WideCharToMultiByte(CP_UTF8, 0, iWString.c_str(), iWString.size(),
oBuffer, iBufSize, NULL, NULL);
if (res == 0)