strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a crash on importing docs with database functions.

Browse source 
When iterating through an empty column via ScDBQueryDataIterator it
caused segfalut. (fdo#30861)
This commit is contained in:
Kohei Yoshida 2010-10-20 15:29:56 +02:00
parent b5543aa005
commit 6545200f25
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sc/source/core/data/dociter.cxx
View file

@ -543,6 +543,10 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
}
SCSIZE nCellCount = mpDoc->GetCellCount(nTab, nCol);
if (!nCellCount)
// No cells found in this column. Bail out.
return false;
SCROW nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, nColRow);
while ( (nColRow < nCellCount) && (nThisRow < nRow) )
nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, ++nColRow);