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

Fix a possible out-of-bounds access in WX_GRID::SetTable()

This commit is contained in:
Maciej Suminski 2018-09-12 10:53:16 +02:00
parent 2c217499b5
commit f5de8cd3e1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/widgets/wx_grid.cpp
View File

@ -47,14 +47,18 @@ void WX_GRID::SetTable( wxGridTableBase* aTable, bool aTakeOwnership )
{ {
// wxGrid::SetTable() messes up the column widths from wxFormBuilder so we have to save // wxGrid::SetTable() messes up the column widths from wxFormBuilder so we have to save
// and restore them. // and restore them.
int* formBuilderColWidths = new int[ GetNumberCols() ]; int numberCols = GetNumberCols();
int* formBuilderColWidths = new int[numberCols];
for( int i = 0; i < GetNumberCols(); ++i ) for( int i = 0; i < numberCols; ++i )
formBuilderColWidths[ i ] = GetColSize( i ); formBuilderColWidths[ i ] = GetColSize( i );
wxGrid::SetTable( aTable ); wxGrid::SetTable( aTable );
// wxGrid::SetTable() may change the number of columns,
// so prevent out-of-bounds access to formBuildColWidths
numberCols = std::min( numberCols, GetNumberCols() );
for( int i = 0; i < GetNumberCols(); ++i ) for( int i = 0; i < numberCols; ++i )
{ {
// correct wxFormBuilder width for large fonts and/or long translations // correct wxFormBuilder width for large fonts and/or long translations
int headingWidth = GetTextExtent( GetColLabelValue( i ) ).x + 2 * MIN_GRIDCELL_MARGIN; int headingWidth = GetTextExtent( GetColLabelValue( i ) ).x + 2 * MIN_GRIDCELL_MARGIN;
@ -191,4 +195,4 @@ bool WX_GRID::CommitPendingChanges( bool aQuietMode )
} }
return true; return true;
} }