[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/workwin.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 7aa14e80d2d9d94ba468b83db32fc1049d1d8b65
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 4 09:07:29 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Apr 4 11:31:37 2019 +0200

    rhbz#1696037 null-deref
    
    Change-Id: I1a9eb5b1b38e2ec651f2d0286337106ab565a9dc
    Reviewed-on: https://gerrit.libreoffice.org/70239
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4bc31eb3de44..a4e281e67c83 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1493,6 +1493,11 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, sal_uInt16 nId )
         {
             vcl::Window *pWin = pCW->GetWindow();
             SfxChild_Impl *pChild = FindChild_Impl(*pWin);
+            if (!pChild)
+            {
+                SAL_WARN("sfx.appl", "missing SfxChild_Impl child!");
+                continue;
+            }
             if (bHide)
             {
                 pChild->nVisible &= ~SfxChildVisibility::ACTIVE;