[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - vcl/source

[Aron Budea (via logerrit)]

 vcl/source/window/window2.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 22297965a0b8c94ad7f2173f22f91ee00ad4698e
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Thu Feb 2 00:08:41 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Feb 3 21:55:10 2023 +0100

    vcl: fix online crash in vcl::Window::IsTracking()
    
    Crashreport signature:
    
    program/libmergedlo.so
            vcl::Window::IsTracking() const
                    vcl/source/window/window2.cxx:340
    program/libmergedlo.so
            (anonymous namespace)::LOKPostAsyncEvent(void*, void*)
                    sfx2/source/view/lokhelper.cxx:812
    program/libmergedlo.so
            LokChartHelper::postMouseEvent(int, int, int, int, int, int, 
double, double)
                    include/rtl/ref.hxx:128
    program/libmergedlo.so
            SfxLokHelper::testInPlaceComponentMouseEventHit(SfxViewShell*, int, 
int, int, int, int, int, double, double, bool)
                    sfx2/source/view/lokhelper.cxx:980
    /program/libswlo.so
            SwXTextDocument::postMouseEvent(int, int, int, int, int, int)
                    sw/source/uibase/uno/unotxdoc.cxx:3663
    program/libmergedlo.so
            doc_postMouseEvent
                    desktop/source/lib/init.cxx:4831
    
    Change-Id: Iab7d24a901e57dc8af3fb2c77fbea3b4fdad9fb9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146483
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 87db8e470e21..180edf5cf961 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -341,9 +341,15 @@ bool Window::IsTracking() const
 {
     if (!mpWindowImpl)
         return false;
-    return (mpWindowImpl->mbUseFrameData ?
-            mpWindowImpl->mpFrameData->mpTrackWin == this :
-            ImplGetSVData()->mpWinData->mpTrackWin == this);
+    if (mpWindowImpl->mbUseFrameData && mpWindowImpl->mpFrameData)
+    {
+        return mpWindowImpl->mpFrameData->mpTrackWin == this;
+    }
+    if (!mpWindowImpl->mbUseFrameData && ImplGetSVData()->mpWinData)
+    {
+        return ImplGetSVData()->mpWinData->mpTrackWin == this;
+    }
+    return false;
 }
 
 void Window::StartAutoScroll( StartAutoScrollFlags nFlags )
commit 3239018539d0e2a5f120ef214013417cff79a572
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 27 08:50:04 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Feb 3 21:55:10 2023 +0100

    fix online crash in WIndow::IsTracking
    
    /opt/collaboraoffice/program/libmergedlo.so
      vcl::Window::IsTracking() const
      
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/vcl/source/window/window2.cxx:340
    /opt/collaboraoffice/program/libmergedlo.so
      (anonymous namespace)::LOKPostAsyncEvent(void*, void*)
      
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/sfx2/source/view/lokhelper.cxx:812
    /opt/collaboraoffice/program/libmergedlo.so
      LokChartHelper::postMouseEvent(int, int, int, int, int, int, double, 
double)
      
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/include/rtl/ref.hxx:128
    
    Change-Id: I204bac7d8f595054abe9b6e8e631c02b26e20361
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146231
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 978dc0b6ecf8..87db8e470e21 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -339,6 +339,8 @@ void Window::EndTracking( TrackingEventFlags nFlags )
 
 bool Window::IsTracking() const
 {
+    if (!mpWindowImpl)
+        return false;
     return (mpWindowImpl->mbUseFrameData ?
             mpWindowImpl->mpFrameData->mpTrackWin == this :
             ImplGetSVData()->mpWinData->mpTrackWin == this);