]> git.saurik.com Git - wxWidgets.git/commitdiff
fix round trip check in wxMBConv_win32::WC2MB() when the buffer size is 0
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 20 Sep 2007 13:16:37 +0000 (13:16 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 20 Sep 2007 13:16:37 +0000 (13:16 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/strconv.cpp

index f4731ceabee2e5203f1c1c7b0f46d2647d63a1fc..3e354f466b668ab41e01c581f0bea6af1df5ac2a 100644 (file)
@@ -2457,8 +2457,10 @@ public:
                     return wxCONV_FAILED;
             }
 
+            if ( !n )
+                n = wcslen(pwz);
             wxWCharBuffer wcBuf(n);
-            if ( MB2WC(wcBuf.data(), buf, n) == wxCONV_FAILED ||
+            if ( MB2WC(wcBuf.data(), buf, n + 1) == wxCONV_FAILED ||
                     wcscmp(wcBuf, pwz) != 0 )
             {
                 // we didn't obtain the same thing we started from, hence