38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From adb69cabeacbe14a4439473107000d6e94d8d033 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
|
|
Date: Mon, 3 Jun 2013 13:40:09 +0200
|
|
Subject: [PATCH 4/5] 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 <florian.haenel@lge.com>
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
|
|
Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3
|
|
---
|
|
src/quick/items/qquickvisualdatamodel.cpp | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp
|
|
index d2e50e8..a460e7f 100644
|
|
--- a/src/quick/items/qquickvisualdatamodel.cpp
|
|
+++ b/src/quick/items/qquickvisualdatamodel.cpp
|
|
@@ -817,7 +817,8 @@ void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *in
|
|
delete cacheItem->object;
|
|
cacheItem->object = 0;
|
|
cacheItem->scriptRef -= 1;
|
|
- cacheItem->contextData->destroy();
|
|
+ if (cacheItem->contextData)
|
|
+ cacheItem->contextData->destroy();
|
|
cacheItem->contextData = 0;
|
|
if (!cacheItem->isReferenced()) {
|
|
removeCacheItem(cacheItem);
|
|
--
|
|
1.8.2.1
|
|
|