[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/window/window2.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6d289be1f5ef530eaa1fc32e1fd2518ab177eeeb
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 27 08:50:04 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Feb 9 10:57:27 2023 +0000

    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>
    (cherry picked from commit d037ad98ca75ae857a566b62e2e86a1a5e7c3590)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146631
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

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);