diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-29 21:06:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-14 15:59:26 +0100 |
| commit | 1663c19834fbff0b9bddfaa7f353c9a1e0589739 (patch) | |
| tree | 10fbac1649b3e3eb2de14538d3939da520966739 | |
| parent | 65c17466a65e88f7133af08323e0cff4764f8e11 (diff) | |
vcl: fix UB in vcl::Cursor::ImplDoShow()
pWindow->mpWindowImpl can be nullptr here, see online.git's
unit-load-torture test:
vcl/source/window/cursor.cxx:204:54: runtime error: member access within null pointer of type 'WindowImpl'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior vcl/source/window/cursor.cxx:204:54 in
(And one more similar case in Window::ImplGrabFocus().)
(cherry picked from commit f12fc2d07e6f2e9d33ad9350b1f005cbcbe72a18)
Conflicts:
vcl/source/window/cursor.cxx
Change-Id: Idd145082b58c10139be53e9b997efedeb0cec364
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107597
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | vcl/source/window/mouse.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 01adba1a2b80..47116725856f 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -313,7 +313,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags ) pSVData->mpWinData->mpFocusWin = this; - if ( pOldFocusWindow ) + if ( pOldFocusWindow && pOldFocusWindow->mpWindowImpl ) { // Cursor hidden if ( pOldFocusWindow->mpWindowImpl->mpCursor ) |