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

added length to wx(Scoped)CharBuffer to improve handling of embedded NULs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-03-29 20:58:39 +00:00
parent d792823395
commit 6df09f32fd
7 changed files with 87 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/string.cpp
View File

@@ -59,7 +59,7 @@
namespace wxPrivate
{
static UntypedBufferData s_untypedNullData(NULL);
static UntypedBufferData s_untypedNullData(NULL, 0);
UntypedBufferData * const untypedNullDataPtr = &s_untypedNullData;
@@ -499,7 +499,8 @@ wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength,
// we must pass the real string length to SubstrBufFromMB ctor
if ( nLength == npos )
nLength = psz ? strlen(psz) : 0;
return SubstrBufFromMB(wxCharBuffer::CreateNonOwned(psz), nLength);
return SubstrBufFromMB(wxCharBuffer::CreateNonOwned(psz, nLength),
nLength);
}
// else: do the roundtrip through wchar_t*
}
@@ -567,7 +568,7 @@ const wxScopedWCharBuffer wxString::wc_str() const
const wxScopedCharBuffer wxString::mb_str(const wxMBConv& conv) const
{
if ( conv.IsUTF8() )
return wxScopedCharBuffer::CreateNonOwned(m_impl.c_str());
return wxScopedCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length());
// FIXME-UTF8: use wc_str() here once we have buffers with length