[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-4' - writerfilter/source

[Miklos Vajna (via logerrit)]

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

New commits:
commit 80d9c9f4900e246e511b5651c542d4d0238d3056
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Dec 16 10:43:07 2022 +0100
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Dec 24 06:30:19 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/+/144592
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit 21a2de9b5e5ae9be260456a10a7ba25a77e73b43)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144611
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit e8236945c0e26caf0148f108a74be8bd4bc28171)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144612
    (cherry picked from commit 79336699772a418dcb19ac86d98810add798f5a3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144654
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d80d5312b71a..f3e873d1054a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5506,6 +5506,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 */