From e02b1ca3c2d8525d5fb3321774136978eab465c9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Jun 2013 12:24:20 +0200 Subject: qtdeclarative-git: Add 2 patches from 5.0.2 * 0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch is applied in newer SRCREV * 0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch is still pending Signed-off-by: Martin Jansa --- ...inter-access-in-QQuickVisualDataModelPriv.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch (limited to 'recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch') diff --git a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch new file mode 100644 index 00000000..a61f8de2 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch @@ -0,0 +1,37 @@ +From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= +Date: Mon, 3 Jun 2013 13:40:09 +0200 +Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate + +I observed null cachItem->contextData which lead to null-pointer access +on cacheItem->contextData->destroy(). + +Task-number: QTBUG-31439 + +Upstream-Status: Backport https://codereview.qt-project.org/57789 + +Signed-of-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 +--- + src/qml/types/qqmldelegatemodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp +index 16572c4..f457538 100644 +--- a/src/qml/types/qqmldelegatemodel.cpp ++++ b/src/qml/types/qqmldelegatemodel.cpp +@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba + delete cacheItem->object; + cacheItem->object = 0; + cacheItem->scriptRef -= 1; +- cacheItem->contextData->destroy(); ++ if (cacheItem->contextData) ++ cacheItem->contextData->destroy(); + cacheItem->contextData = 0; + + if (!cacheItem->isReferenced()) { +-- +1.8.2.1 + -- cgit v1.2.3-54-g00ecf