5c78d8fa56f3065c80738202c45836a495782952
[feed/video.git] / frameworks / qt5base / patches / 005-fix-segv-if-no-cursor.patch
1 From a51a71ba6b08fcd761d5b0547bcd5d65f341d837 Mon Sep 17 00:00:00 2001
2 From: Mirko Vogt <mirko-qt@nanl.de>
3 Date: Mon, 27 Nov 2017 20:25:38 +0100
4 Subject: [PATCH 1/2] QFbCursor::pointerEvent(): Fix SEGV if
5 QT_QPA_FB_HIDECURSOR is set
6
7 getCurrentRect() accesses mCursorImage.image() which is NULL in case of
8 QT_QPA_FB_HIDECURSOR=1.
9 Avoid respective calls in pointerEvent() by returning early in such
10 case.
11
12 Signed-off-by: Mirko Vogt <mirko-qt@nanl.de>
13 ---
14 src/platformsupport/fbconvenience/qfbcursor.cpp | 2 ++
15 1 file changed, 2 insertions(+)
16
17 diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsupport/fbconvenience/qfbcursor.cpp
18 index 7daf3f4d0c..c7b1a71c04 100644
19 --- a/src/platformsupport/fbconvenience/qfbcursor.cpp
20 +++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
21 @@ -112,6 +112,8 @@ void QFbCursor::pointerEvent(const QMouseEvent &e)
22 if (e.type() != QEvent::MouseMove)
23 return;
24 m_pos = e.screenPos().toPoint();
25 + if (!mVisible)
26 + return;
27 mCurrentRect = getCurrentRect();
28 if (mOnScreen || mScreen->geometry().intersects(mCurrentRect.translated(mScreen->geometry().topLeft())))
29 setDirty();
30 --
31 2.15.0
32