From 5b0bb2babfa3b7116465d340cd1da2e9f9bedb78 Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Tue, 11 Apr 2017 15:04:05 +0200 Subject: qtdeclarative: fix memory leaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix QQmlExpression leaking QQmlError objects * Fix V4 Javascript Engine creating duplicate entries * Fix memory leak in QQuickWindowPrivate::deliverTouchAsMouse Signed-off-by: Gordan Markuš Signed-off-by: Martin Jansa --- ...-QQmlExpression-leaking-QQmlError-objects.patch | 35 +++++++++ .../qtdeclarative/0002-Fix-memory-leak-in-V4.patch | 44 ++++++++++++ ...leak-in-QQuickWindowPrivate-deliverTouchA.patch | 84 ++++++++++++++++++++++ recipes-qt/qt5/qtdeclarative_git.bb | 6 ++ 4 files changed, 169 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch create mode 100644 recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch create mode 100644 recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch b/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch new file mode 100644 index 00000000..050a914e --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch @@ -0,0 +1,35 @@ +From f9dcbf008b430aadd464985b7a618eca8173d264 Mon Sep 17 00:00:00 2001 +From: Robert Griebl +Date: Thu, 23 Feb 2017 15:11:13 +0100 +Subject: [PATCH 1/3] Fix QQmlExpression leaking QQmlError objects +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If the user doesn't clear any potential errors manually via clearError(), +then do it automatically in the destructor. Found with valgrind. + +[ChangeLog][QtQml][QQmlExpression] Fixed memory leak + +Change-Id: If5b1181850c7463c939a7ba536d74e7054c53d60 +Reviewed-by: Simon Hausmann +Signed-off-by: Gordan Markuš +--- + src/qml/qml/qqmlexpression.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp +index 6afbd05..5cb3d4d 100644 +--- a/src/qml/qml/qqmlexpression.cpp ++++ b/src/qml/qml/qqmlexpression.cpp +@@ -200,6 +200,7 @@ QQmlExpression::QQmlExpression(QQmlContextData *ctxt, QObject *scope, + */ + QQmlExpression::~QQmlExpression() + { ++ clearError(); + } + + /*! +-- +2.9.3 + diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch new file mode 100644 index 00000000..423681ee --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch @@ -0,0 +1,44 @@ +From 80e63c5a2981473dd7ee3a4f382e54948bb99f75 Mon Sep 17 00:00:00 2001 +From: Gunnar Sletta +Date: Thu, 19 Jan 2017 09:05:46 +0100 +Subject: [PATCH 2/3] Fix memory leak in V4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Transitions contain both an id and a set of flags, but the sorting +failed to take the flags into account in the operator<. As a result +we would some times end up with duplicate entries if the same id +was added multiple times with different flags. + +If the same id was added again and again with varying flags, this +could lead to an ever expanding list filled with duplicate entries. + +Fix this by also taking flags into account in operator< so that +operator< and operator== are symetric and the list gets correctly +sorted. + +Change-Id: I762ec3f0c5b4ed9a1aecb9a883187a0445491591 +Reviewed-by: Simon Hausmann +Reviewed-by: Robin Burchell +Signed-off-by: Gordan Markuš +--- + src/qml/jsruntime/qv4internalclass_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h +index dcda949..1d8ef4b 100644 +--- a/src/qml/jsruntime/qv4internalclass_p.h ++++ b/src/qml/jsruntime/qv4internalclass_p.h +@@ -234,7 +234,7 @@ struct InternalClassTransition + { return id == other.id && flags == other.flags; } + + bool operator<(const InternalClassTransition &other) const +- { return id < other.id; } ++ { return id < other.id || (id == other.id && flags < other.flags); } + }; + + struct InternalClass : public QQmlJS::Managed { +-- +2.9.3 + diff --git a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch new file mode 100644 index 00000000..79a48f54 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch @@ -0,0 +1,84 @@ +From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001 +From: Shawn Rutledge +Date: Wed, 1 Feb 2017 12:06:26 +0100 +Subject: [PATCH 3/3] fix memory leak in + QQuickWindowPrivate::deliverTouchAsMouse +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A QTouchEvent is allocated with a reduced subset of TouchPoints for +each Item to which we attempt to deliver it, and thrown away afterwards. +(Ιt's not efficient to heap-allocate it, but we can't avoid doing it +at all without changing behavior.) So now it's stored in a QScopedPointer. + +Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b +Reviewed-by: Jan Arve Sæther +Signed-off-by: Gordan Markuš +--- + src/quick/items/qquickwindow.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp +index 1297dde..c130aec 100644 +--- a/src/quick/items/qquickwindow.cpp ++++ b/src/quick/items/qquickwindow.cpp +@@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve + + // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here. + Q_ASSERT(pointerEvent->asPointerTouchEvent()); +- QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item); +- if (!event) ++ QScopedPointer event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item)); ++ if (event.isNull()) + return false; + + // For each point, check if it is accepted, if not, try the next point. +@@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve + break; + + qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item; +- QScopedPointer mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false)); ++ QScopedPointer mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false)); + + // Send a single press and see if that's accepted + QCoreApplication::sendEvent(item, mousePress.data()); +@@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve + pointerEventPoint->setGrabber(item); + + if (checkIfDoubleClicked(event->timestamp())) { +- QScopedPointer mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); ++ QScopedPointer mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false)); + QCoreApplication::sendEvent(item, mouseDoubleClick.data()); + event->setAccepted(mouseDoubleClick->isAccepted()); + if (!mouseDoubleClick->isAccepted()) { +@@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve + } else if (touchMouseDevice == device && p.id() == touchMouseId) { + if (p.state() & Qt::TouchPointMoved) { + if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { +- QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false)); ++ QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false)); + QCoreApplication::sendEvent(item, me.data()); + event->setAccepted(me->isAccepted()); + if (me->isAccepted()) { +@@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve + // no grabber, check if we care about mouse hover + // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now. + // hover for touch??? +- QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false)); ++ QScopedPointer me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false)); + if (lastMousePosition.isNull()) + lastMousePosition = me->windowPos(); + QPointF last = lastMousePosition; +@@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve + } else if (p.state() & Qt::TouchPointReleased) { + // currently handled point was released + if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { +- QScopedPointer me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false)); ++ QScopedPointer me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false)); + QCoreApplication::sendEvent(item, me.data()); + + if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) { +-- +2.9.3 + diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index a620a00a..c19bbd56 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -14,6 +14,12 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " +SRC_URI += " \ + file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \ + file://0002-Fix-memory-leak-in-V4.patch \ + file://0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch \ +" + DEPENDS += "qtbase" PACKAGECONFIG ??= "qtxmlpatterns" -- cgit v1.2.3-54-g00ecf