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

Bounds checking for DIALOG_SIM_MODEL::curModel().

This commit is contained in:
Jeff Young 2023-02-04 19:13:09 +00:00
parent 52b07b8bac
commit f588da2bef
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -919,15 +919,20 @@ int DIALOG_SIM_MODEL<T_symbol, T_field>::findSymbolPinRow( const wxString& aSymb
template <typename T_symbol, typename T_field>
SIM_MODEL& DIALOG_SIM_MODEL<T_symbol, T_field>::curModel() const
{
if( m_useLibraryModelRadioButton->GetValue()
&& m_modelNameChoice->GetSelection() != wxNOT_FOUND )
if( m_useLibraryModelRadioButton->GetValue() )
{
return m_libraryModelsMgr.GetModels().at( m_modelNameChoice->GetSelection() ).get();
int sel = m_modelNameChoice->GetSelection();
if( sel >= 0 && sel < (int) m_modelNameChoice->GetCount() )
return m_libraryModelsMgr.GetModels().at( m_modelNameChoice->GetSelection() ).get();
}
else
{
return m_builtinModelsMgr.GetModels().at( static_cast<int>( m_curModelType ) );
if( (int) m_curModelType < (int) m_builtinModelsMgr.GetModels().size() )
return m_builtinModelsMgr.GetModels().at( (int) m_curModelType );
}
return m_builtinModelsMgr.GetModels().at( (int) SIM_MODEL::TYPE::NONE );
}