summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-08-03 15:27:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-09-13 14:57:38 +0200
commitc67873216bb476935a753c3597ba91d8029f307b (patch)
treee77ccd3055ed11ebe261357fadc0dbfd5c727da4 /recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
parent671313d0b5e09e0b49a90ed944cd33fb3d6457b0 (diff)
downloadmeta-qt5-c67873216bb476935a753c3597ba91d8029f307b.tar.gz
recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe
* this will make maintaining meta-qt5 a bit easier Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
deleted file mode 100644
index 0182248e..00000000
--- a/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From adb69cabeacbe14a4439473107000d6e94d8d033 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 4/5] 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/quick/items/qquickvisualdatamodel.cpp | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp
22index d2e50e8..a460e7f 100644
23--- a/src/quick/items/qquickvisualdatamodel.cpp
24+++ b/src/quick/items/qquickvisualdatamodel.cpp
25@@ -817,7 +817,8 @@ void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *in
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 if (!cacheItem->isReferenced()) {
34 removeCacheItem(cacheItem);
35--
361.8.2.1
37