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

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit a9c45790df301440d1182e033beb388dfac35a35
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 24 11:10:18 2021 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Mar 29 14:14:43 2021 +0200

    ImplNewInputContext: check pointer before use
    
    Change-Id: Id98cc2037f6cfb9c5468d67b00595d940aa88946
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113030
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b3f6ce9e9a29..0143bf85ee2f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1708,7 +1708,7 @@ void Window::ImplNewInputContext()
 {
     ImplSVData* pSVData = ImplGetSVData();
     vcl::Window* pFocusWin = pSVData->mpWinData->mpFocusWin;
-    if ( !pFocusWin )
+    if ( !pFocusWin || !pFocusWin->mpWindowImpl )
         return;
 
     // Is InputContext changed?