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

don't crash if used in iconv-like fashion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-08-18 17:23:08 +00:00
parent e492150d40
commit 49dd9820ac
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/strconv.cpp
View File

@@ -662,8 +662,11 @@ size_t IC_CharSet::MB2WC(wchar_t *buf, const char *psz, size_t n)
WC_BSWAP(buf /* _not_ bufPtr */, res)
}
// iconv doesn't seem to set the trailing 0
buf[res] = 0;
// NB: iconv was given only strlen(psz) characters on input, and so
// it couldn't convert the trailing zero. Let's do it ourselves
// if there's some room left for it in the output buffer.
if (res < n)
buf[res] = 0;
}
else
{
@@ -724,9 +727,11 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
res = n-outbuf;
// iconv() doesn't set the trailing zero, but moves buf to
// that position
buf[0] = 0;
// NB: iconv was given only wcslen(psz) characters on input, and so
// it couldn't convert the trailing zero. Let's do it ourselves
// if there's some room left for it in the output buffer.
if (res < n)
buf[0] = 0;
}
else
{