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

fix bug with wrong return value in wxMBConv_iconv::ToWChar() introduced by a recent check in

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-31 01:53:10 +00:00
parent d50c083157
commit 1752fda65b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/strconv.cpp
View File

@@ -2111,10 +2111,14 @@ wxMBConv_iconv::ToWChar(wchar_t *dst, size_t dstLen,
char* bufPtr = (char*)dst; char* bufPtr = (char*)dst;
// have destination buffer, convert there // have destination buffer, convert there
size_t dstLenOrig = dstLen;
cres = iconv(m2w, cres = iconv(m2w,
ICONV_CHAR_CAST(&pszPtr), &srcLen, ICONV_CHAR_CAST(&pszPtr), &srcLen,
&bufPtr, &dstLen); &bufPtr, &dstLen);
res = dstLen - (dstLen / SIZEOF_WCHAR_T);
// convert the number of bytes converted as returned by iconv to the
// number of (wide) characters converted that we need
res = (dstLenOrig - dstLen) / SIZEOF_WCHAR_T;
if (ms_wcNeedsSwap) if (ms_wcNeedsSwap)
{ {
@@ -2122,10 +2126,6 @@ wxMBConv_iconv::ToWChar(wchar_t *dst, size_t dstLen,
for ( unsigned i = 0; i < res; i++ ) for ( unsigned i = 0; i < res; i++ )
dst[i] = WC_BSWAP(dst[i]); dst[i] = WC_BSWAP(dst[i]);
} }
// NUL-terminate the string if there is any space left
if (res < dstLen)
dst[res] = 0;
} }
else // no destination buffer else // no destination buffer
{ {