[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/dialog/srchdlg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b888dff2f010ae20216c40f39cf6dee66d1fea14
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Apr 4 19:27:41 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Apr 6 11:23:36 2020 +0200

    rhbz#1820868 deref of null xLayoutManager
    
    Change-Id: Ib396ef9f5b019b08a181eeb5a8eb983bdb401db4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91711
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 1f95fbe21a7c..445bc318718b 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2440,6 +2440,8 @@ OUString SvxSearchDialogWrapper::GetSearchLabel()
             pViewFrame->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
     xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
+    if (!xLayoutManager.is())
+        return OUString();
     css::uno::Reference< css::ui::XUIElement > xUIElement =
         xLayoutManager->getElement("private:resource/toolbar/findbar");
     if (!xUIElement.is())