From f9cff6e17341ea95da89eaa27f78b32f11291e12 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Jul 2009 18:53:11 +0000 Subject: [PATCH] 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 --- src/gtk/aboutdlg.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index a6fc079e05..1cc3136bf6 100644 --- a/src/gtk/aboutdlg.cpp +++ b/src/gtk/aboutdlg.cpp @@ -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(m_strings[n])); #endif -- 2.45.2