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

[Caolán McNamara (via logerrit)]

 sw/source/core/unocore/unofield.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d9cf8459ef49f3011de3003538b503d0be06dc17
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 13 15:50:25 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Apr 17 13:03:08 2023 +0200

    Resolves: tdf#152619 crash inspecting uninserted XFieldMaster
    
    Change-Id: I765dd5d7e1ed2c1749841491a50216a6afe903c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150351
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 5464a1dad69c52d011b194baf7d543ce8dd27748)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150321
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 71c7c3dddb1291e262b1f8132b75e95fc6f9fa02)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150333
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/unocore/unofield.cxx 
b/sw/source/core/unocore/unofield.cxx
index abe754f62b4f..e6320e9d248b 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1325,6 +1325,8 @@ SwXTextField::getTextFieldMaster()
     SolarMutexGuard aGuard;
 
     SwFieldType* pType = m_pImpl->GetFieldType();
+    if (!pType && !m_pImpl->m_pDoc) // tdf#152619
+        return nullptr;
     uno::Reference<beans::XPropertySet> const xRet(
             SwXFieldMaster::CreateXFieldMaster(m_pImpl->m_pDoc, pType));
     return xRet;