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

[Michael Meeks (via logerrit)]

 vcl/source/window/mouse.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f08ef2fd6edea7a5776597045cb710c90f3ad7ca
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jul 16 14:32:36 2021 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jul 16 20:24:48 2021 +0200

    vcl: check mpWindowImpl for nullptr.
    
    Crash in calc's mouse capture / end tracking.
    
    Change-Id: If5b4cded8ebfc04d1fcf645a7b74184532ab2338
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119069
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 513b186b2dc7..e1f9c9e6777e 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -467,7 +467,8 @@ void Window::ReleaseMouse()
     {
         ImplSVData* pSVData = ImplGetSVData();
         pSVData->mpWinData->mpCaptureWin = nullptr;
-        mpWindowImpl->mpFrame->CaptureMouse( false );
+        if (mpWindowImpl && mpWindowImpl->mpFrame)
+            mpWindowImpl->mpFrame->CaptureMouse( false );
         ImplGenerateMouseMove();
     }
 }