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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 5c239e2728200f05a541d5dee30614632b0c471d..bb50f19d4b6ce533f2942069b189f7f9364602e7 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2111,10 +2111,14 @@ wxMBConv_iconv::ToWChar(wchar_t *dst, size_t dstLen,
         char* bufPtr = (char*)dst;
 
         // have destination buffer, convert there
         char* bufPtr = (char*)dst;
 
         // have destination buffer, convert there

+        size_t dstLenOrig = dstLen;

         cres = iconv(m2w,
                      ICONV_CHAR_CAST(&pszPtr), &srcLen,
                      &bufPtr, &dstLen);
         cres = iconv(m2w,
                      ICONV_CHAR_CAST(&pszPtr), &srcLen,
                      &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++ )
                 dst[i] = WC_BSWAP(dst[i]);
         }
             for ( unsigned i = 0; i < res; 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
     {