From 4876b0b60a92cd028a821c7c1c095ed55fb15f68 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 10 Oct 2019 16:11:07 +0200 Subject: Handle null in QQuickPointerEvent and QQEventPoint debug operators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example qDebug() << event->asMouseEvent() could crash if the event is not a mouse event. Change-Id: I34ffadeb9fc23f42d1d6939190c43a6486eea533 Reviewed-by: Jan Arve Sæther --- src/quick/items/qquickevents.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 8303c3fed1..7d128b4a16 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -1937,6 +1937,10 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickPointerEvent *e { QDebugStateSaver saver(dbg); dbg.nospace(); + if (!event) { + dbg << "QQuickPointerEvent(0)"; + return dbg; + } dbg << "QQuickPointerEvent("; dbg << event->timestamp(); dbg << " dev:"; @@ -1957,6 +1961,10 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickEventPoint *eve { QDebugStateSaver saver(dbg); dbg.nospace(); + if (!event) { + dbg << "QQuickEventPoint(0)"; + return dbg; + } dbg << "QQuickEventPoint(accepted:" << event->isAccepted() << " state:"; QtDebugUtils::formatQEnum(dbg, event->state()); -- cgit v1.2.3