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

Fix recently introduced crash during wxGrid initialization

Browse Source 
CellToGridWindow(), added by frozen rows/columns patch, returned NULL
when called with invalid row/col arguments and this could happen if any
of several methods using m_currentCellCoords were called during wxGrid
initialization, while m_currentCellCoords was still (-1, -1).

Fix this by testing for this case explicitly and returning the main grid
window, which is never NULL, instead.

Closes #18454.
This commit is contained in:
Daniel Kulp
2019-07-28 01:53:52 +02:00
committed by Vadim Zeitlin
parent bcf604b5cb
commit b9d668e8f1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/grid.cpp
View File

@@ -7323,7 +7323,12 @@ wxRect wxGrid::CellToRect( int row, int col ) const
wxGridWindow* wxGrid::CellToGridWindow( int row, int col ) const
{
if ( row < m_numFrozenRows && GetColPos(col) < m_numFrozenCols )
// It may happen that we're called during grid creation, when the current
// cell still has invalid coordinates -- don't return (possibly null)
// frozen corner window in this case.
if ( row == -1 && col == -1 )
return m_gridWin;
else if ( row < m_numFrozenRows && GetColPos(col) < m_numFrozenCols )
return m_frozenCornerGridWin;
else if ( row < m_numFrozenRows )
return m_frozenRowGridWin;