[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/source vcl/source

[Michael Meeks (via logerrit)]

 sfx2/source/view/lokhelper.cxx |   13 ++++++++-----
 vcl/source/window/window2.cxx  |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 2ac23d25f0670c3274603deb88aef352def635a1
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Mon Jan 3 14:15:49 2022 +0000
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Tue Jan 4 17:08:27 2022 +0100

    lokit: double check for disposed windows & fix leak.
    
    it seems we can get windows disposed before we get to the emission.
    
    <segv>
    vcl::Window::IsTracking() const vcl/source/window/window2.cxx:341
    (anonymous namespace)::LOKPostAsyncEvent(void*, void*) 
sfx2/source/view/lokhelper.cxx:725
    LokChartHelper::postMouseEvent(int, int, int, int, int, int, double, 
double) include/rtl/ref.hxx:112
    SwXTextDocument::postMouseEvent(int, int, int, int, int, int) 
sw/source/uibase/uno/unotxdoc.cxx:3561
    
    Change-Id: I93aea931dad1e7f43d3d610568424c53d2b22fbc
    Signed-off-by: Michael Meeks <michael.me...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127939

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 1641811af86d..bbfbc58f835f 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -627,7 +627,7 @@ namespace
 
     void LOKPostAsyncEvent(void* pEv, void*)
     {
-        LOKAsyncEventData* pLOKEv = static_cast<LOKAsyncEventData*>(pEv);
+        std::unique_ptr<LOKAsyncEventData> 
pLOKEv(static_cast<LOKAsyncEventData*>(pEv));
         if (pLOKEv->mpWindow->IsDisposed())
             return;
 
@@ -648,6 +648,9 @@ namespace
         if (!pFocusWindow)
             pFocusWindow = pLOKEv->mpWindow;
 
+        if (pLOKEv->mpWindow->IsDisposed())
+            return;
+
         switch (pLOKEv->mnEvent)
         {
         case VclEventId::WindowKeyInput:
@@ -656,11 +659,13 @@ namespace
             KeyEvent singlePress(pLOKEv->maKeyEvent.GetCharCode(),
                                  pLOKEv->maKeyEvent.GetKeyCode());
             for (sal_uInt16 i = 0; i <= nRepeat; ++i)
-                pFocusWindow->KeyInput(singlePress);
+                if (!pFocusWindow->IsDisposed())
+                    pFocusWindow->KeyInput(singlePress);
             break;
         }
         case VclEventId::WindowKeyUp:
-            pFocusWindow->KeyUp(pLOKEv->maKeyEvent);
+            if (!pFocusWindow->IsDisposed())
+                pFocusWindow->KeyUp(pLOKEv->maKeyEvent);
             break;
         case VclEventId::WindowMouseButtonDown:
             pLOKEv->mpWindow->LogicMouseButtonDown(pLOKEv->maMouseEvent);
@@ -691,8 +696,6 @@ namespace
             assert(false);
             break;
         }
-
-        delete pLOKEv;
     }
 
     void postEventAsync(LOKAsyncEventData *pEvent)
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 88bf838cf846..8282396af932 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -312,7 +312,7 @@ void Window::EndTracking( TrackingEventFlags nFlags )
 
 bool Window::IsTracking() const
 {
-    return (ImplGetSVData()->mpWinData->mpTrackWin == this);
+    return mpWindowImpl && (ImplGetSVData()->mpWinData->mpTrackWin == this);
 }
 
 void Window::StartAutoScroll( StartAutoScrollFlags nFlags )