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

fixed bug that caused wxHtmlWindow to segfault on html tables with cell(s) with rowspan>=3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-11-23 20:09:18 +00:00
parent 84e4a8257d
commit 80eab46937
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/html/m_tables.cpp
View File

@@ -169,19 +169,21 @@ void wxHtmlTableCell::ReallocCols(int cols)
void wxHtmlTableCell::ReallocRows(int rows) void wxHtmlTableCell::ReallocRows(int rows)
{ {
m_CellInfo = (cellStruct**) realloc(m_CellInfo, sizeof(cellStruct*) * rows); m_CellInfo = (cellStruct**) realloc(m_CellInfo, sizeof(cellStruct*) * rows);
if (m_NumCols != 0) { for (int row = m_NumRows; row < rows ; row++)
int x = rows - 1; {
m_CellInfo[x] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols); if (m_NumCols == 0)
for (int i = 0; i < m_NumCols; i++) m_CellInfo[row] = NULL;
m_CellInfo[x][i].flag = cellFree;
}
else else
m_CellInfo[rows - 1] = NULL; {
m_CellInfo[row] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols);
for (int col = 0; col < m_NumCols; col++)
m_CellInfo[row][col].flag = cellFree;
}
}
m_NumRows = rows; m_NumRows = rows;
} }
void wxHtmlTableCell::AddRow(const wxHtmlTag& tag) void wxHtmlTableCell::AddRow(const wxHtmlTag& tag)
{ {
if (m_ActualRow + 1 > m_NumRows - 1) if (m_ActualRow + 1 > m_NumRows - 1)