haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EDA_LIST_DIALOG: fix a crash due to use after delete data. 

A list of wxArrayString was used in dialog, but not stored in this dialog.
(and this list was deleted by the caller)
A copy is now stored in dialog.
Fixes #11543
https://gitlab.com/kicad/code/kicad/issues/11543
This commit is contained in:
jean-pierre charras 2022-05-03 17:21:21 +02:00
parent b6522bfc66
commit ee4e50518f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/dialogs/eda_list_dialog.cpp
View File

@ -36,14 +36,13 @@ static int DEFAULT_SINGLE_COL_WIDTH = 260;
static int DEFAULT_COL_WIDTHS[] = { 200, 600 };
EDA_LIST_DIALOG::EDA_LIST_DIALOG( wxWindow* aParent, const wxString& aTitle,
const wxArrayString& aItemHeaders,
const std::vector<wxArrayString>& aItemList,
const wxString& aPreselectText ) :
EDA_LIST_DIALOG_BASE( aParent, wxID_ANY, aTitle )
{
m_itemsList = &aItemList;
m_itemsList = aItemList;
m_filterBox->SetHint( _( "Filter" ) );
@ -80,7 +79,7 @@ void EDA_LIST_DIALOG::initDialog( const wxArrayString& aItemHeaders, const wxStr
}
}
InsertItems( *m_itemsList, 0 );
InsertItems( m_itemsList, 0 );
if( !aSelection.IsEmpty() )
{
@ -127,7 +126,7 @@ void EDA_LIST_DIALOG::textChangeInFilterBox( wxCommandEvent& event )
m_listBox->DeleteAllItems();
for( const wxArrayString& row : *m_itemsList )
for( const wxArrayString& row : m_itemsList )
{
itemName = row.Item( 0 );

3
include/eda_list_dialog.h
View File

@ -79,7 +79,8 @@ private:
void sortList();
private:
const std::vector<wxArrayString>* m_itemsList;
// The list of items, locally stored
std::vector<wxArrayString> m_itemsList;
};