LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-22 01:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ofz#51431 Timeout

Browse Source 
Change-Id: Ibcaefe2f12d2cad41eb8c7e6cd2924cf2c0c8e3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2022-11-06 13:06:09 +00:00
parent 6d1118245f
commit 1a47dff65b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sc/source/filter/excel/impop.cxx
View File

@ -95,7 +95,8 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
mnIxfeIndex( 0 ),
mnLastRecId(0),
mbBiff2HasXfs(false),
mbBiff2HasXfsValid(false)
mbBiff2HasXfsValid(false),
mbFuzzing(utl::ConfigManager::IsFuzzing())
{
nBdshtTab = 0;
@ -979,7 +980,11 @@ void ImportExcel::Cellmerging()
maStrm >> aXclRange; // 16-bit rows and columns
ScRange aScRange( ScAddress::UNINITIALIZED );
if( rAddrConv.ConvertRange( aScRange, aXclRange, nScTab, nScTab, true ) )
GetXFRangeBuffer().SetMerge( aScRange.aStart.Col(), aScRange.aStart.Row(), aScRange.aEnd.Col(), aScRange.aEnd.Row() );
{
const bool bTooSlowForFuzzing = mbFuzzing && (aScRange.aEnd.Col() > 512 || aScRange.aEnd.Row() > 512);
if (!bTooSlowForFuzzing)
GetXFRangeBuffer().SetMerge( aScRange.aStart.Col(), aScRange.aStart.Row(), aScRange.aEnd.Col(), aScRange.aEnd.Row() );
}
++nIdx;
}
}
@ -1102,7 +1107,7 @@ void ImportExcel::TableOp()
sal_uInt16 nInpRow2 = aIn.ReaduInt16();
sal_uInt16 nInpCol2 = aIn.ReaduInt16();
if (utl::ConfigManager::IsFuzzing())
if (mbFuzzing)
{
//shrink to smallish arbitrary value to not timeout
nLastRow = std::min<sal_uInt16>(nLastRow, MAXROW_30 / 2);

1
sc/source/filter/inc/imp_op.hxx
View File

@ -115,6 +115,7 @@ protected:
bool mbBiff2HasXfs:1; /// Select XF formatting or direct formatting in BIFF2.
bool mbBiff2HasXfsValid:1; /// False = mbBiff2HasXfs is undetermined yet.
bool mbFuzzing:1; /// True if fuzzing filter
void SetLastFormula( SCCOL nCol, SCROW nRow, double fVal, sal_uInt16 nXF, ScFormulaCell* pCell );