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

fixed FromUTF8() to accept NULL as well as len==npos; this fixes crashes when loading XML files in UTF-8 build with wxUSE_STL=1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-16 14:29:52 +00:00
parent 1663c65500
commit f966a73d40
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@@ -1207,11 +1207,19 @@ public:
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
static wxString FromUTF8(const char *utf8) static wxString FromUTF8(const char *utf8)
{ {
if ( !utf8 )
return wxEmptyString;
wxASSERT( wxStringOperations::IsValidUtf8String(utf8) ); wxASSERT( wxStringOperations::IsValidUtf8String(utf8) );
return FromImpl(wxStringImpl(utf8)); return FromImpl(wxStringImpl(utf8));
} }
static wxString FromUTF8(const char *utf8, size_t len) static wxString FromUTF8(const char *utf8, size_t len)
{ {
if ( !utf8 )
return wxEmptyString;
if ( len == npos )
return FromUTF8(utf8);
wxASSERT( wxStringOperations::IsValidUtf8String(utf8, len) ); wxASSERT( wxStringOperations::IsValidUtf8String(utf8, len) );
return FromImpl(wxStringImpl(utf8, len)); return FromImpl(wxStringImpl(utf8, len));
} }