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

don't allocate 0-sized buffer in cWC2MB() even if input size is 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-06 18:49:47 +00:00
parent d68d85908b
commit 13d92ad62a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/strconv.cpp
View File

@@ -422,9 +422,15 @@ wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
const wxCharBuffer const wxCharBuffer
wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
{ {
const size_t dstLen = FromWChar(NULL, 0, inBuff, inLen); size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
if ( dstLen != wxCONV_FAILED ) if ( dstLen != wxCONV_FAILED )
{ {
if ( !dstLen )
{
// special case: can't allocate 0 size buffer below
dstLen++;
}
wxCharBuffer buf(dstLen - 1); wxCharBuffer buf(dstLen - 1);
if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED ) if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
{ {
@@ -433,11 +439,12 @@ wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
*outLen = dstLen; *outLen = dstLen;
const size_t nulLen = GetMBNulLen(); const size_t nulLen = GetMBNulLen();
if ( !NotAllNULs(buf.data() + dstLen - nulLen, nulLen) ) if ( dstLen >= nulLen &&
!NotAllNULs(buf.data() + dstLen - nulLen, nulLen) )
{ {
// in this case the output is NUL-terminated and we're not // in this case the output is NUL-terminated and we're not
// supposed to count NUL // supposed to count NUL
(*outLen) -= nulLen; *outLen -= nulLen;
} }
} }