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

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/TableManager.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8fe3795621a577a866fcd748465b6ee0b6a5385a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jun 28 19:58:59 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jun 28 21:52:40 2022 +0200

    crashtesting: assert on loading forum-mso-en-8971.docx
    
    Change-Id: Ifce343a26a03b0a17624d584cb8936df49db6148
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136588
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/writerfilter/source/dmapper/TableManager.cxx 
b/writerfilter/source/dmapper/TableManager.cxx
index 17fc3085d990..58f1c32b15e6 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -51,7 +51,11 @@ bool TableManager::isIgnore() const { return isRowEnd(); }
 
 sal_uInt32 TableManager::getGridBefore(sal_uInt32 nRow)
 {
-    assert(isInTable());
+    if (!isInTable())
+    {
+        SAL_WARN("writerfilter", "TableManager::getGridBefore called while not 
in table");
+        return 0;
+    }
     if (nRow >= mTableDataStack.top()->getRowCount())
         return 0;
     return mTableDataStack.top()->getRow(nRow)->getGridBefore();
@@ -69,7 +73,11 @@ void TableManager::setCurrentGridBefore(sal_uInt32 
nSkipGrids)
 
 sal_uInt32 TableManager::getGridAfter(sal_uInt32 nRow)
 {
-    assert(isInTable());
+    if (!isInTable())
+    {
+        SAL_WARN("writerfilter", "TableManager::getGridBefore called while not 
in table");
+        return 0;
+    }
     if (nRow >= mTableDataStack.top()->getRowCount())
         return 0;
     return mTableDataStack.top()->getRow(nRow)->getGridAfter();