[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source

[Miklos Vajna (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit cfa1fc9be9831a61fba736d428c2c2e56fbf7617
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon May 22 09:15:50 2023 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue May 23 05:21:19 2023 +0200

    sd: fix crash in SdXImpressDocument::postMouseEvent()
    
    Crashreport signature:
    
    program/libsdlo.so
          SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)
                  sd/source/ui/unoidl/unomodel.cxx:2615
    program/libmergedlo.so
          doc_postMouseEvent
                  desktop/source/lib/init.cxx:5007
    
    Change-Id: I321f39b284f5917048925bf45c9a6417ac9cb2ad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152079
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8e02660f628f..eac9ad74385b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2612,6 +2612,11 @@ void SdXImpressDocument::postMouseEvent(int nType, int 
nX, int nY, int nCount, i
     SdrPageView* pPageView = pDrawView->GetSdrPageView();
     SdrPage* pPage = pPageView->GetPage();
     ::sd::Window* pActiveWin = pViewShell->GetActiveWindow();
+    if (!pActiveWin)
+    {
+        return;
+    }
+
     if (LokControlHandler::postMouseEvent(pPage, pDrawView, *pActiveWin, 
nType, aPointHMM, nCount, nButtons, nModifier))
             return;