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

[Caolán McNamara (via logerrit)]

 accessibility/inc/extended/accessibletablistboxtable.hxx |    8 +++++++-
 sc/source/filter/lotus/lotimpop.cxx                      |    5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit b65a0b7fb7edbb15b2c1a534cc753afe4362c143
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 11 12:44:11 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 11 16:00:59 2019 +0200

    cid#1448422 Division or modulo by zero
    
    Change-Id: Id4bd62b13ed5c797274915f5b1fa44fa3bc46c1c
    Reviewed-on: https://gerrit.libreoffice.org/77267
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
index 68e71f0e83d1..78a679f45393 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -59,7 +59,13 @@ private:
     sal_Int32 implGetSelRowCount() const;
 
     /** Returns the row index from cell index. */
-    sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
+    sal_Int32 implGetRow( sal_Int32 _nIndex ) const
+    {
+        auto nColCount = implGetColumnCount();
+        assert(nColCount != 0);
+        return _nIndex / nColCount;
+    }
+
     /** Returns the absolute row index of the nSelRow-th selected row. */
     sal_Int32 implGetSelRow( sal_Int32 _nSelRow ) const;
 
commit 5a3e1685f741e597666ad2767d0749c01e041740
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 11 12:41:37 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 11 16:00:48 2019 +0200

    cid#1242793 make fuzzing tabsize check compile time instead of runtime
    
    Change-Id: I9f5190e903a7e645712210b3e3aa5f2ad42c0d72
    Reviewed-on: https://gerrit.libreoffice.org/77266
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 6848c6caa8b3..25fe9c7f8c32 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -33,6 +33,7 @@
 #include <namebuff.hxx>
 #include <lotattr.hxx>
 #include <stringutil.hxx>
+#include <config_fuzzers.h>
 
 #include <unotools/configmgr.hxx>
 
@@ -327,9 +328,11 @@ void ImportLotus::NamedSheet()
     Read(aName);
 
     SCTAB nLTab(SanitizeTab(static_cast<SCTAB>(nTmpTab)));
+#if ENABLE_FUZZERS
     //ofz#14167 arbitrary sheet limit to make fuzzing useful
-    if (nLTab > 5 && utl::ConfigManager::IsFuzzing())
+    if (nLTab > 5
         nLTab = 5;
+#endif
 
     if (pD->HasTable(nLTab))
         pD->RenameTab(nLTab, aName);