From 82b76851d5dd7e531a22e04a32ce4e54410a686c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 15 Apr 2005 14:12:33 +0000 Subject: [PATCH] Don't crash if buffer null git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/textctrl.cpp | 6 ++++++ src/gtk1/textctrl.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 5ec85604f1..8b1cf320b1 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1002,6 +1002,12 @@ void wxTextCtrl::WriteText( const wxString &text ) #else wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); #endif + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } + gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); #else diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 5ec85604f1..8b1cf320b1 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -1002,6 +1002,12 @@ void wxTextCtrl::WriteText( const wxString &text ) #else wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); #endif + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } + gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); #else -- 2.45.2