Don't crash with invalid QModelIndex or when QTreeWidgetItem is NULL in mimeData()

Change-Id: I0a9abaa05cf136eadf222d3e7d102930719b84ff
Reviewed-by: David Faure <david.faure@kdab.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 7378b9979a..769a5b97b9 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -3273,8 +3273,18 @@ QMimeData *QTreeWidget::mimeData(const QList<QTreeWidgetItem*> items) const
         QList<QModelIndex> indexes;
         for (int i = 0; i < items.count(); ++i) {
             QTreeWidgetItem *item = items.at(i);
+            if (!item) {
+                qWarning() << "QTreeWidget::mimeData: Null-item passed";
+                return 0;
+            }
+
             for (int c = 0; c < item->values.count(); ++c) {
-                indexes << indexFromItem(item, c);
+                const QModelIndex index = indexFromItem(item, c);
+                if (!index.isValid()) {
+                    qWarning() << "QTreeWidget::mimeData: No index associated with item :" << item;
+                    return 0;
+                }
+                indexes << index;
             }
         }
         return d->model->QAbstractItemModel::mimeData(indexes);