summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-06-14 12:24:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-14 12:24:25 +0200
commite02b1ca3c2d8525d5fb3321774136978eab465c9 (patch)
tree7a94a6c615ebcc0942e4c682064b4fc426edd3d6 /recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
parentda60ee1856a65ddcc349c5b42ae88d29e31c1e94 (diff)
downloadmeta-qt5-e02b1ca3c2d8525d5fb3321774136978eab465c9.tar.gz
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch37
1 files changed, 37 insertions, 0 deletions
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 @@
1From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Mon, 3 Jun 2013 13:40:09 +0200
4Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate
5
6I observed null cachItem->contextData which lead to null-pointer access
7on cacheItem->contextData->destroy().
8
9Task-number: QTBUG-31439
10
11Upstream-Status: Backport https://codereview.qt-project.org/57789
12
13Signed-of-by: Florian Haenel <florian.haenel@lge.com>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15
16Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3
17---
18 src/qml/types/qqmldelegatemodel.cpp | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
22index 16572c4..f457538 100644
23--- a/src/qml/types/qqmldelegatemodel.cpp
24+++ b/src/qml/types/qqmldelegatemodel.cpp
25@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba
26 delete cacheItem->object;
27 cacheItem->object = 0;
28 cacheItem->scriptRef -= 1;
29- cacheItem->contextData->destroy();
30+ if (cacheItem->contextData)
31+ cacheItem->contextData->destroy();
32 cacheItem->contextData = 0;
33
34 if (!cacheItem->isReferenced()) {
35--
361.8.2.1
37