anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7535 by adding a bounds check. There is still a problem here,

Browse Source 
though, which will surface somewhere. See the bug.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39422 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-08-05 16:10:46 +00:00
parent f2da774a7d
commit 5ccbda0e66
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/insets/InsetTabular.cpp
View File

@ -1339,7 +1339,13 @@ int Tabular::textVOffset(idx_type cell) const
Tabular::idx_type Tabular::getFirstCellInRow(row_type row) const
{
col_type c = 0;
while (cell_info[row][c].multirow == CELL_PART_OF_MULTIROW)
idx_type const numcells = numberOfCellsInRow(row);
// we check against numcells to make sure we do not crash if all the
// cells are multirow (bug #7535), but in that case our return value
// is really invalid, i.e., it is NOT the first cell in the row. but
// i do not know what to do here. (rgh)
while (c < numcells - 1
&& cell_info[row][c].multirow == CELL_PART_OF_MULTIROW)
++c;
return cell_info[row][c].cellno;
}
@ -1348,6 +1354,9 @@ Tabular::idx_type Tabular::getFirstCellInRow(row_type row) const
Tabular::idx_type Tabular::getLastCellInRow(row_type row) const
{
col_type c = ncols() - 1;
// of course we check against 0 so we don't crash. but we have the same
// problem as in the previous routine: if all the cells are part of a
// multirow or part of a multi column, then our return value is invalid.
while (c > 0
&& (cell_info[row][c].multirow == CELL_PART_OF_MULTIROW
|| cell_info[row][c].multicolumn == CELL_PART_OF_MULTICOLUMN))