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

Don't crash in wx{File,Dir}PickerCtrl::GetTextCtrlValue()

Browse Source 
If there is no text field, assert and return empty string instead of
just crashing.

Closes #14078.
This commit is contained in:
Vadim Zeitlin
2019-07-25 21:43:00 +02:00
parent f9e80841dd
commit aba9c119fa
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/filepickercmn.cpp
View File

@@ -203,6 +203,8 @@ bool wxFilePickerCtrl::Create(wxWindow *parent,
wxString wxFilePickerCtrl::GetTextCtrlValue() const wxString wxFilePickerCtrl::GetTextCtrlValue() const
{ {
wxCHECK_MSG( m_text, wxString(), "Can't be used if no text control" );
// filter it through wxFileName to remove any spurious path separator // filter it through wxFileName to remove any spurious path separator
return wxFileName(m_text->GetValue()).GetFullPath(); return wxFileName(m_text->GetValue()).GetFullPath();
} }
@@ -241,6 +243,8 @@ bool wxDirPickerCtrl::Create(wxWindow *parent,
wxString wxDirPickerCtrl::GetTextCtrlValue() const wxString wxDirPickerCtrl::GetTextCtrlValue() const
{ {
wxCHECK_MSG( m_text, wxString(), "Can't be used if no text control" );
// filter it through wxFileName to remove any spurious path separator // filter it through wxFileName to remove any spurious path separator
return wxFileName::DirName(m_text->GetValue()).GetPath(); return wxFileName::DirName(m_text->GetValue()).GetPath();
} }