Applied patch [ 762033 ] wxTextValidator crashes when given a NULL wxString

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 530772a890fc3d967eda09a4323f582863576678..90627aa28dc393b2e088dab9ac66a9098f208aaf 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -206,6 +206,9 @@ bool wxTextValidator::TransferToWindow(void)
     if( !CheckValidator() )
         return FALSE;
 
     if( !CheckValidator() )
         return FALSE;
 

+    if (!m_stringValue)
+        return TRUE;
+

     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
     control->SetValue(* m_stringValue) ;
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
     control->SetValue(* m_stringValue) ;
 


@@ -218,6 +221,9 @@ bool wxTextValidator::TransferFromWindow(void)
     if( !CheckValidator() )
         return FALSE;
 
     if( !CheckValidator() )
         return FALSE;
 

+    if (!m_stringValue)
+        return TRUE;
+

     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
     * m_stringValue = control->GetValue() ;
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
     * m_stringValue = control->GetValue() ;