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

[Julien Nabet (via logerrit)]

 sw/source/core/unocore/unosett.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2838868784825ad99141454829c711c5c36e75fd
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Jun 27 09:27:50 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jun 27 17:17:05 2020 +0200

    cid#1464974: Null pointer dereferences (sw/unosett)
    
    Change-Id: I4ea6de59ce1d1cb3133b0fb57176caee5497878f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97297
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 817938749bf7..81f1a6a2e33a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1771,8 +1771,8 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
         {
             OUString sBulletFontName;
             rProp.Value >>= sBulletFontName;
-            SwDocShell* pLclDocShell = pDoc->GetDocShell();
-            if( !sBulletFontName.isEmpty() && pLclDocShell )
+            SwDocShell* pLclDocShell = nullptr;
+            if( !sBulletFontName.isEmpty() && pDoc && (pLclDocShell = pDoc->GetDocShell()) )
             {
                 const SvxFontListItem* pFontListItem =
                         static_cast<const SvxFontListItem* >(pLclDocShell