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

fixed fatal buffer overwrite in wxMBConvUTF16swap::MB2WC()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-31 20:23:33 +00:00
parent 04a378342d
commit bfab25d4c4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/strconv.cpp
View File

@@ -862,20 +862,22 @@ size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
// swap 16bit MB to 16bit String // swap 16bit MB to 16bit String
size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len=0; size_t len = 0;
while (*(wxUint16*)psz && (!buf || len < n)) while ( *psz && (!buf || len < n) )
{ {
if (buf) if ( buf )
{ {
((char *)buf)[0] = psz[1]; ((char *)buf)[0] = psz[1];
((char *)buf)[1] = psz[0]; ((char *)buf)[1] = psz[0];
buf++; buf++;
} }
len++; len++;
psz += sizeof(wxUint16); psz += 2;
} }
if (buf && len<n) *buf=0;
if ( buf && len < n )
*buf = L'\0';
return len; return len;
} }