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

Don't cache incorrect length in wxString::assign(char*, size_t).

Browse Source 
The length of the string here is specified in bytes and is not the same as the
string length for non-ASCII UTF-8 strings, so don't cache it as the string
length.

Just invalidate the cached length instead as we simply don't know what the
real length of the string is going to be.

See #14130.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-23 15:13:13 +00:00
parent bd42a07c7a
commit 556a836e0f
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/string.h
View File

@@ -2669,7 +2669,7 @@ public:
wxString& assign(const char *sz, size_t n) wxString& assign(const char *sz, size_t n)
{ {
wxSTRING_SET_CACHED_LENGTH(n); wxSTRING_INVALIDATE_CACHE();
SubstrBufFromMB str(ImplStr(sz, n)); SubstrBufFromMB str(ImplStr(sz, n));
m_impl.assign(str.data, str.len); m_impl.assign(str.data, str.len);

9
tests/strings/strings.cpp
View File

@@ -192,6 +192,12 @@ void StringTestCase::Constructors()
CPPUNIT_ASSERT_EQUAL( 0, wxString(wxString(), 17).length() ); CPPUNIT_ASSERT_EQUAL( 0, wxString(wxString(), 17).length() );
// This string has 3 characters (<h>, <e'> and <l>), not 4!
wxString s3("h\xc3\xa9llo", 4);
CPPUNIT_ASSERT_EQUAL( 3, s3.length() );
CPPUNIT_ASSERT_EQUAL( 'l', (char)s3[2] );
static const char *s = "?really!"; static const char *s = "?really!";
const char *start = wxStrchr(s, 'r'); const char *start = wxStrchr(s, 'r');
const char *end = wxStrchr(s, '!'); const char *end = wxStrchr(s, '!');
@@ -219,6 +225,9 @@ void StringTestCase::StaticConstructors()
CPPUNIT_ASSERT_EQUAL( "Hello", wxString::FromUTF8("Hello", 5) ); CPPUNIT_ASSERT_EQUAL( "Hello", wxString::FromUTF8("Hello", 5) );
CPPUNIT_ASSERT_EQUAL( "Hello", wxString::FromUTF8("Hello") ); CPPUNIT_ASSERT_EQUAL( "Hello", wxString::FromUTF8("Hello") );
CPPUNIT_ASSERT_EQUAL( 2, wxString::FromUTF8("h\xc3\xa9llo", 3).length() );
//CPPUNIT_ASSERT_EQUAL( 1, wxString::FromUTF8("", 1).length() ); //CPPUNIT_ASSERT_EQUAL( 1, wxString::FromUTF8("", 1).length() );
} }