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

[Caolán McNamara (via logerrit)]

 sw/source/filter/html/htmltab.cxx |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 3f9127d149492b572aebd32a3baee040b4c8d30b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 11 14:59:09 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Apr 11 19:40:40 2021 +0200

    ofz#26099 skip slow path when fuzzing
    
    Change-Id: Idef5a50733bc4bdef45ea613b4833df0b9d7c9e0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113952
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index a9e403e94519..b56a016e8d74 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2291,16 +2291,19 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
     // Step 1: needed layout structures are created (including tables in tables)
     CreateLayoutInfo();
 
-    // Step 2: the minimal and maximal column width is calculated
-    // (including tables in tables). Since we don't have boxes yet,
-    // we'll work on the start nodes
-    m_xLayoutInfo->AutoLayoutPass1();
-
-    // Step 3: the actual column widths of this table are calculated (not tables in tables)
-    // We need this now to decide if we need filler cells
-    // (Pass1 was needed because of this as well)
-    m_xLayoutInfo->AutoLayoutPass2( nAbsAvail, nRelAvail, nAbsLeftSpace,
-                                  nAbsRightSpace, nInhAbsSpace );
+    if (!utl::ConfigManager::IsFuzzing()) // skip slow path for fuzzing
+    {
+        // Step 2: the minimal and maximal column width is calculated
+        // (including tables in tables). Since we don't have boxes yet,
+        // we'll work on the start nodes
+        m_xLayoutInfo->AutoLayoutPass1();
+
+        // Step 3: the actual column widths of this table are calculated (not tables in tables)
+        // We need this now to decide if we need filler cells
+        // (Pass1 was needed because of this as well)
+        m_xLayoutInfo->AutoLayoutPass2( nAbsAvail, nRelAvail, nAbsLeftSpace,
+                                      nAbsRightSpace, nInhAbsSpace );
+    }
 
     // Set adjustment for the top table
     sal_Int16 eHoriOri;