AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected last change to cWC2MB() to also work for encoding with NUL length > 1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-05-06 18:53:43 +00:00
parent 13d92ad62a
commit 168a76fe3d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/strconv.cpp
View File

@ -425,13 +425,9 @@ wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
size_t dstLen = FromWChar(NULL, 0, inBuff, inLen); size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
if ( dstLen != wxCONV_FAILED ) if ( dstLen != wxCONV_FAILED )
{ {
if ( !dstLen ) // special case of empty input: can't allocate 0 size buffer below as
{ // wxCharBuffer insists on NUL-terminating it
// special case: can't allocate 0 size buffer below wxCharBuffer buf(dstLen ? dstLen - 1 : 1);
dstLen++;
}
wxCharBuffer buf(dstLen - 1);
if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED ) if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
{ {
if ( outLen ) if ( outLen )