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

making sure NULs stay in the result, even if the string is not nul terminated

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-25 21:24:02 +00:00
parent e8c0d57346
commit c45fad9aa9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@@ -333,7 +333,7 @@ wxMBConv::FromWChar(char *dst, size_t dstLen,
return wxCONV_FAILED; return wxCONV_FAILED;
dstWritten += lenChunk; dstWritten += lenChunk;
if ( isNulTerminated ) if ( src+lenChunk < srcEnd || isNulTerminated )
dstWritten += lenNul; dstWritten += lenNul;
if ( dst ) if ( dst )
@@ -345,7 +345,7 @@ wxMBConv::FromWChar(char *dst, size_t dstLen,
return wxCONV_FAILED; return wxCONV_FAILED;
dst += lenChunk; dst += lenChunk;
if ( isNulTerminated ) if ( src+lenChunk < srcEnd || isNulTerminated )
dst += lenNul; dst += lenNul;
} }
} }
@@ -3371,6 +3371,8 @@ wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
#ifdef __WINDOWS__ #ifdef __WINDOWS__
WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_win32, wxConvLibc, wxEMPTY_PARAMETER_VALUE); WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_win32, wxConvLibc, wxEMPTY_PARAMETER_VALUE);
#elif 0 // defined(__WXOSX__)
WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_cf, wxConvLibc, (wxFONTENCODING_UTF8));
#else #else
WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConvLibc, wxConvLibc, wxEMPTY_PARAMETER_VALUE); WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConvLibc, wxConvLibc, wxEMPTY_PARAMETER_VALUE);
#endif #endif