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

Check that rows in wxDataViewListCtrl have the right size

Browse Source 
Vectors passed to wxDataViewListCtrl::{Append,Insert,Prepend}Item()
functions must have the correct, i.e. equal to the column count, number
of items as otherwise accessing them later would result in a crash.

Add checks verifying that this is indeed the case.

Closes https://github.com/wxWidgets/wxWidgets/pull/724
This commit is contained in:
Kvaz1r
2018-02-16 21:02:54 +02:00
committed by Vadim Zeitlin
parent 958d0081a5
commit 3567cd5b00
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/datavcmn.cpp
View File

@@ -2209,6 +2209,7 @@ wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const
void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data ) void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data )
{ {
wxCHECK_RET( values.size() == GetColumnCount(), "wrong number of values" );
wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
line->m_values = values; line->m_values = values;
m_data.push_back( line ); m_data.push_back( line );
@@ -2218,6 +2219,7 @@ void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxUIntP
void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data ) void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data )
{ {
wxCHECK_RET( values.size() == GetColumnCount(), "wrong number of values" );
wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
line->m_values = values; line->m_values = values;
m_data.insert( m_data.begin(), line ); m_data.insert( m_data.begin(), line );
@@ -2228,6 +2230,7 @@ void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxUInt
void wxDataViewListStore::InsertItem( unsigned int row, const wxVector<wxVariant> &values, void wxDataViewListStore::InsertItem( unsigned int row, const wxVector<wxVariant> &values,
wxUIntPtr data ) wxUIntPtr data )
{ {
wxCHECK_RET( values.size() == GetColumnCount(), "wrong number of values" );
wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
line->m_values = values; line->m_values = values;
m_data.insert( m_data.begin()+row, line ); m_data.insert( m_data.begin()+row, line );