[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 884d448169ae9ac3cedbb128b0b78edb92150ab4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Apr 4 19:27:41 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Apr 5 11:12:01 2020 +0200

    rhbz#1820868 deref of null xLayoutManager
    
    Change-Id: Ib396ef9f5b019b08a181eeb5a8eb983bdb401db4

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 20cd94e06252..0294154e650e 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2461,6 +2461,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())