From c0e47716c402da2333bfa4082c7b40e3b376135c Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Wed, 6 Aug 2014 13:51:19 +0200 Subject: MultiPointTouchArea: Guard _mouseTouchPoint with a QPointer. The touch point can be deleted (for instance, on ungrab()) without _mouseTouchPoint being reset occurs. This caused a crash on tst_qquickmultipointtoucharea::inFlickable with MallocScribble=1 enabled on OS X (use-after-free). Change-Id: Ife9f59d75827285b18bb1772ddbee30d79a3f0b5 Reviewed-by: Erik Verbruggen Reviewed-by: Shawn Rutledge --- src/quick/items/qquickmultipointtoucharea.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/quick/items/qquickmultipointtoucharea.cpp') diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index ee31c018af..f09c761ff3 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -349,7 +349,6 @@ QQuickMultiPointTouchArea::QQuickMultiPointTouchArea(QQuickItem *parent) : QQuickItem(parent), _minimumTouchPoints(0), _maximumTouchPoints(INT_MAX), - _mouseTouchPoint(Q_NULLPTR), _stealMouse(false), _mouseEnabled(true) { -- cgit v1.2.3