writerfilter/source/dmapper/DomainMapper_Impl.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 604f8c233c6543940d0c794223e24ac5d0749679
Author:     Miklos Vajna <[email protected]>
AuthorDate: Fri Dec 16 10:43:07 2022 +0100
Commit:     Miklos Vajna <[email protected]>
CommitDate: Mon Dec 19 09:28:46 2022 +0000

    writerfilter: fix crash in DomainMapper_Impl::convertFieldFormula()
    
    Crashreport signature:
    
    program/libwriterfilterlo.so
            writerfilter::dmapper::SettingsTable::GetListSeparator() const
                    writerfilter/source/dmapper/SettingsTable.cxx:489
    program/libwriterfilterlo.so
            
writerfilter::dmapper::DomainMapper_Impl::convertFieldFormula(rtl::OUString 
const&)
                    include/rtl/ustring.hxx:226
    program/libwriterfilterlo.so
            
writerfilter::dmapper::DomainMapper_Impl::handleFieldFormula(tools::SvRef<writerfilter::dmapper::FieldContext>
 const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> 
const&)
                    include/rtl/ustring.hxx:527
    program/libwriterfilterlo.so
            writerfilter::dmapper::DomainMapper_Impl::CloseFieldCommand()
                    writerfilter/source/dmapper/DomainMapper_Impl.cxx:6458
    
    Change-Id: I7f48f76cacffa00d633d92f0a51b2d82f96d1e74
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144314
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Reviewed-by: Miklos Vajna <[email protected]>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2f7fda4b1388..a3fba36fc39c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5300,6 +5300,11 @@ void DomainMapper_Impl::handleFieldAsk
  */
 OUString DomainMapper_Impl::convertFieldFormula(const OUString& input) {
 
+    if (!m_pSettingsTable)
+    {
+        return input;
+    }
+
     OUString listSeparator = m_pSettingsTable->GetListSeparator();
 
     /* Replace logical condition functions with LO equivalent operators */

Reply via email to