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

merge r60175

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-04-15 20:17:40 +00:00
parent e98988ecdb
commit 02cbcf5808
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/core/strconv_cf.cpp
View File

@@ -115,8 +115,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
dstSize * sizeof(wchar_t),
&usedBufLen);
// charsConverted is > 0 iff conversion succeeded
if(charsConverted <= 0)
if(charsConverted < CFStringGetLength(theString))
return wxCONV_FAILED;
/* usedBufLen is the number of bytes written, so we divide by
@@ -217,8 +216,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
&usedBufLen
);
// charsConverted is > 0 iff conversion succeeded
if(charsConverted <= 0)
if(charsConverted < CFStringGetLength(theString) )
return wxCONV_FAILED;
return usedBufLen;