diff options
| author | Florian Haenel <florian.haenel@lge.com> | 2013-06-08 00:49:24 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-03 19:21:29 +0200 |
| commit | c1ba5228d70483e11d269035f779355970aedef5 (patch) | |
| tree | 83f8de04f6b0c88ab48d01223b05d3ba94697a95 /recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch | |
| parent | 3463bd2df599aa2fc3629ed5bed9ac259da02502 (diff) | |
| download | meta-qt5-c1ba5228d70483e11d269035f779355970aedef5.tar.gz | |
qtdeclarative-5.0.2: Add 4 patches for runtime issues
* 3 backports from newer qtdeclarative:
System Hang while moving App Ribbon
Fix for segfault in some ListView Cases
Make use of BGRA texture format to improve image upload time
* 1 pending fix:
Fix for ViewTransitions not working in horizontal ListViews
Signed-off-by: Florian Haenel <florian.haenel@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch new file mode 100644 index 00000000..0182248e --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From adb69cabeacbe14a4439473107000d6e94d8d033 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> | ||
| 3 | Date: Mon, 3 Jun 2013 13:40:09 +0200 | ||
| 4 | Subject: [PATCH 4/5] Fix null-pointer access in QQuickVisualDataModelPrivate | ||
| 5 | |||
| 6 | I observed null cachItem->contextData which lead to null-pointer access | ||
| 7 | on cacheItem->contextData->destroy(). | ||
| 8 | |||
| 9 | Task-number: QTBUG-31439 | ||
| 10 | |||
| 11 | Upstream-Status: Backport https://codereview.qt-project.org/57789 | ||
| 12 | |||
| 13 | Signed-of-by: Florian Haenel <florian.haenel@lge.com> | ||
| 14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 15 | |||
| 16 | Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 | ||
| 17 | --- | ||
| 18 | src/quick/items/qquickvisualdatamodel.cpp | 3 ++- | ||
| 19 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp | ||
| 22 | index 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 | -- | ||
| 36 | 1.8.2.1 | ||
| 37 | |||
