Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the length returned by UTF-32 conversion for non-BMP input

Browse Source 
Don't optimize the required length as this is a tiny gain resulting in big
problems with the strings containing surrogates for which the actual result is
shorter than the length returned, resulting in extra NUL bytes at the end of
the converted buffer.

This is similar to 3410aa372f (see #16298) but
for UTF-32 and not UTF-16.

Closes #17070.
This commit is contained in:
ARATA Mizuki
2016-02-21 14:38:17 +01:00
committed by Vadim Zeitlin
parent baff0c942b
commit 5a92181ac1
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/strconv.cpp
View File

@@ -1887,18 +1887,6 @@ wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
if ( srcLen == wxNO_LEN )
srcLen = wxWcslen(src) + 1;
if ( !dst )
{
// optimization: return maximal space which could be needed for this
// string instead of the exact amount which could be less if there are
// any surrogates in the input
//
// we consider that surrogates are rare enough to make it worthwhile to
// avoid running the loop below at the cost of slightly extra memory
// consumption
return srcLen * BYTES_PER_CHAR;
}
wxUint32 *outBuff = reinterpret_cast<wxUint32 *>(dst);
size_t outLen = 0;
for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
@@ -1909,10 +1897,13 @@ wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
outLen += BYTES_PER_CHAR;
if ( outLen > dstLen )
return wxCONV_FAILED;
if ( outBuff )
{
if ( outLen > dstLen )
return wxCONV_FAILED;
*outBuff++ = ch;
*outBuff++ = ch;
}
}
return outLen;
@@ -1965,18 +1956,6 @@ wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
if ( srcLen == wxNO_LEN )
srcLen = wxWcslen(src) + 1;
if ( !dst )
{
// optimization: return maximal space which could be needed for this
// string instead of the exact amount which could be less if there are
// any surrogates in the input
//
// we consider that surrogates are rare enough to make it worthwhile to
// avoid running the loop below at the cost of slightly extra memory
// consumption
return srcLen*BYTES_PER_CHAR;
}
wxUint32 *outBuff = reinterpret_cast<wxUint32 *>(dst);
size_t outLen = 0;
for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
@@ -1987,10 +1966,13 @@ wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
outLen += BYTES_PER_CHAR;
if ( outLen > dstLen )
return wxCONV_FAILED;
if ( outBuff )
{
if ( outLen > dstLen )
return wxCONV_FAILED;
*outBuff++ = wxUINT32_SWAP_ALWAYS(ch);
*outBuff++ = wxUINT32_SWAP_ALWAYS(ch);
}
}
return outLen;