From ef52f19e6ad14e3740dee3e79b8e348a70054d09 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 7 Dec 2008 23:33:46 +0000 Subject: [PATCH] check index validity in AddGrowable{Row,Col}() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/sizer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index beb46796bc..63a832d8ff 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -1830,7 +1830,8 @@ bool wxFlexGridSizer::IsColGrowable( size_t idx ) void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion ) { - wxASSERT_MSG( !IsRowGrowable( idx ), + wxCHECK_RET( idx < (size_t)GetRows(), "invalid row index" ); + wxASSERT_MSG( !IsRowGrowable( idx ), "AddGrowableRow() called for growable row" ); m_growableRows.Add( idx ); m_growableRowsProportions.Add( proportion ); @@ -1838,7 +1839,8 @@ void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion ) void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion ) { - wxASSERT_MSG( !IsColGrowable( idx ), + wxCHECK_RET( idx < (size_t)GetCols(), "invalid column index" ); + wxASSERT_MSG( !IsColGrowable( idx ), "AddGrowableCol() called for growable column" ); m_growableCols.Add( idx ); m_growableColsProportions.Add( proportion ); -- 2.47.2