[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - lotuswordpro/source

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwptablelayout.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0795050df0cf79b163c78e048a9f42051e401a61
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 27 10:12:37 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Oct 28 09:38:07 2020 +0100

    ofz#26676 null deref
    
    Change-Id: Ic2bd8b49762266ad48263bd68a143b46fb5fd66f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104834
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 1e371b56426f..00da4c2545d2 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -889,7 +889,14 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
             XFRow* pXFRow = pTmpTable->GetRow(1);
             pXFTable->AddHeaderRow(pXFRow);
             pTmpTable->RemoveRow(1);
-            nContentRow = m_RowsMap[0]->GetCurMaxSpannedRows(0,nCol);
+            auto iter = m_RowsMap.find(0);
+            if (iter == m_RowsMap.end())
+            {
+                SAL_WARN("lwp", "row 0 is unknown");
+                nContentRow = 0;
+            }
+            else
+                nContentRow = iter->second->GetCurMaxSpannedRows(0,nCol);
         }
     }
     return nContentRow;