Kaydet (Commit) e2227a4f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Avoid using uninitialized nCol, nRow

...when aIter.GetNext returned null; found by Valgrind'ing JunitTest_sc_unoapi_4

Change-Id: Ia94928f78d0512755ee6d788b0470dea34b2a9a7
üst a238c829
...@@ -5518,12 +5518,12 @@ bool ScGridWindow::ContinueOnlineSpelling() ...@@ -5518,12 +5518,12 @@ bool ScGridWindow::ContinueOnlineSpelling()
SCROW nRow; SCROW nRow;
ScRefCellValue* pCell = aIter.GetNext(nCol, nRow); ScRefCellValue* pCell = aIter.GetNext(nCol, nRow);
SCROW nEndRow = 0; SCROW nEndRow = 0;
bool bHidden = pDoc->RowHidden(nRow, nTab, nullptr, &nEndRow); bool bHidden = pCell && pDoc->RowHidden(nRow, nTab, nullptr, &nEndRow);
bool bSkip = pCell && (nRow < mpSpellCheckCxt->maPos.mnRow || bHidden); bool bSkip = pCell && (nRow < mpSpellCheckCxt->maPos.mnRow || bHidden);
while (bSkip) while (bSkip)
{ {
pCell = aIter.GetNext(nCol, nRow); pCell = aIter.GetNext(nCol, nRow);
if (nRow > nEndRow) if (pCell && nRow > nEndRow)
{ {
bHidden = pDoc->RowHidden(nRow, nTab, nullptr, &nEndRow); bHidden = pDoc->RowHidden(nRow, nTab, nullptr, &nEndRow);
} }
...@@ -5531,12 +5531,12 @@ bool ScGridWindow::ContinueOnlineSpelling() ...@@ -5531,12 +5531,12 @@ bool ScGridWindow::ContinueOnlineSpelling()
} }
SCCOL nEndCol = 0; SCCOL nEndCol = 0;
bHidden = pDoc->ColHidden(nCol, nTab, nullptr, &nEndCol); bHidden = pCell && pDoc->ColHidden(nCol, nTab, nullptr, &nEndCol);
bSkip = pCell && (nCol < mpSpellCheckCxt->maPos.mnCol || bHidden); bSkip = pCell && (nCol < mpSpellCheckCxt->maPos.mnCol || bHidden);
while (bSkip) while (bSkip)
{ {
pCell = aIter.GetNext(nCol, nRow); pCell = aIter.GetNext(nCol, nRow);
if (nCol > nEndCol) if (pCell && nCol > nEndCol)
{ {
bHidden = pDoc->ColHidden(nCol, nTab, nullptr, &nEndCol); bHidden = pDoc->ColHidden(nCol, nTab, nullptr, &nEndCol);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment