don't call release() on non-owned buffer in wchar_t build (closes #10964); copy utf8_str() return value in ASCII one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -54,11 +54,19 @@ public:
|
||||
|
||||
for ( size_t n = 0; n < m_count; n++ )
|
||||
{
|
||||
#if wxUSE_UNICODE_UTF8
|
||||
m_strings[n] = a[n].utf8_str();
|
||||
#else
|
||||
#if wxUSE_UNICODE
|
||||
// notice that there is no need to copy the string pointer here
|
||||
// because this class is used only as a temporary and during its
|
||||
// existence the pointer persists in wxString which uses it either
|
||||
// for internal representation (in wxUSE_UNICODE_UTF8 case) or as
|
||||
// cached m_convertedToChar (in wxUSE_UNICODE_WCHAR case)
|
||||
m_strings[n] = wxGTK_CONV_SYS(a[n]);
|
||||
#else // !wxUSE_UNICODE
|
||||
// and in ANSI build we can simply borrow the pointer from
|
||||
// wxCharBuffer (which owns it in this case) instead of copying it
|
||||
// but we then become responsible for freeing it
|
||||
m_strings[n] = wxGTK_CONV_SYS(a[n]).release();
|
||||
#endif
|
||||
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
|
||||
}
|
||||
|
||||
// array must be NULL-terminated
|
||||
@@ -69,7 +77,7 @@ public:
|
||||
|
||||
~GtkArray()
|
||||
{
|
||||
#if !wxUSE_UNICODE_UTF8
|
||||
#if !wxUSE_UNICODE
|
||||
for ( size_t n = 0; n < m_count; n++ )
|
||||
free(const_cast<gchar *>(m_strings[n]));
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user