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

Constructor should survive getting passed a null pointer for conversion.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-24 12:25:03 +00:00
parent d9e89b159c
commit 435595e02f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/string.cpp
View File

@@ -256,8 +256,7 @@ wxString::wxString(const void *pStart, const void *pEnd)
wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
{ {
// first get necessary size // first get necessary size
size_t nLen = psz ? conv.MB2WC((wchar_t *) NULL, psz, 0) : 0;
size_t nLen = conv.MB2WC((wchar_t *) NULL, psz, 0);
// nLength is number of *Unicode* characters here! // nLength is number of *Unicode* characters here!
if (nLen > nLength) if (nLen > nLength)
@@ -279,8 +278,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
wxString::wxString(const wchar_t *pwz) wxString::wxString(const wchar_t *pwz)
{ {
// first get necessary size // first get necessary size
size_t nLen = pwz ? wxWC2MB((char *) NULL, pwz, 0) : 0;
size_t nLen = wxWC2MB((char *) NULL, pwz, 0);
// empty? // empty?
if ( nLen != 0 ) { if ( nLen != 0 ) {