From c65a558e00da57303d4eeb817f034e4037543aa3 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 13 Apr 2012 15:30:52 +0200 Subject: Accessibility: Check for valid range of tree items. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This might lead to crashes otherwise. Change-Id: Ib28ac03b7d200571a0e759467eb692cfee3b05f3 Reviewed-by: Jan-Arve Sæther --- src/plugins/accessible/widgets/itemviews.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/plugins/accessible') diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index c0a8ec4286..92e8f9fcac 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -401,6 +401,10 @@ QModelIndex QAccessibleTree::indexFromLogical(int row, int column) const return QModelIndex(); const QTreeView *treeView = qobject_cast(view()); + if (treeView->d_func()->viewItems.count() <= row) { + qWarning() << "QAccessibleTree::indexFromLogical: invalid index: " << row << column << " for " << treeView; + return QModelIndex(); + } QModelIndex modelIndex = treeView->d_func()->viewItems.at(row).index; if (modelIndex.isValid() && column > 0) { -- cgit v1.2.3