check index validity in AddGrowable{Row,Col}()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index beb46796bc4b0a8cb479376d27a814cb06893709..63a832d8ff9beb1f321595d47655360fa26e8b50 100644 (file)
--- 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 )
 {
 
 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 );
                   "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 )
 {
 
 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 );
                   "AddGrowableCol() called for growable column" );
     m_growableCols.Add( idx );
     m_growableColsProportions.Add( proportion );