[Libreoffice-commits] core.git: sc/source

[Caolán McNamara]

 sc/source/filter/excel/impop.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit f4b80fc579abcb372ba87f08b575dbdb080dd077
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 15 15:46:57 2018 +0100

    ofz#6352 set limits for useful fuzzing
    
    Change-Id: Id4a2dab7da84adf6c6268340dff34e8776abe924
    Reviewed-on: https://gerrit.libreoffice.org/54383
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 85ebffc50295..44585254d753 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -30,11 +30,12 @@
 #include <editeng/editobj.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/flditem.hxx>
-#include <svx/pageitem.hxx>
 #include <editeng/colritem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
+#include <svx/pageitem.hxx>
 #include <svl/zforlist.hxx>
+#include <unotools/configmgr.hxx>
 
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>
@@ -1080,6 +1081,12 @@ void ImportExcel::TableOp()
     nInpRow2 = aIn.ReaduInt16();
     nInpCol2 = aIn.ReaduInt16();
 
+    if (utl::ConfigManager::IsFuzzing())
+    {
+        //shrink to smallish arbitrary value to not timeout
+        nLastRow = std::min<sal_uInt16>(nLastRow, MAXROW_30);
+    }
+
     if( ValidColRow( nLastCol, nLastRow ) )
     {
         if( nFirstCol && nFirstRow )