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

[Michael Meeks (via logerrit)]

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

New commits:
commit 751053e8c998960fbe53f498eb06965b48ea7885
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jul 16 14:32:36 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Jul 20 11:13:13 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/+/119034
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit c7b9f477f69c317e0482aeee79b1c2f070a1b981)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119037
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

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