diff options
author | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2018-02-28 09:23:54 +0100 |
---|---|---|
committer | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2018-03-01 05:26:12 +0000 |
commit | e8425f9e52c9df0ce0fbf122adff3ef6930f9961 (patch) | |
tree | 9ed39a86cd81de4f12c5542308e2441bdfccde93 | |
parent | db6d14318d77c798679e2e4d41c2d9033ac8523a (diff) |
QHeaderView: Fix crash in layout about to change
Before there was a risk looking up e.g index -1 if there
were no visible sections in layoutAboutToChange.
Change-Id: Ic911e4292e8e8c4892fef1c0f34cf7dccaad2bac
Task-number: QTBUG-65478
Reviewed-by: David Faure <david.faure@kdab.com>
-rw-r--r-- | src/widgets/itemviews/qheaderview.cpp | 6 | ||||
-rw-r--r-- | tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index 26d7c5472a..708b9b44ca 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -2163,9 +2163,11 @@ void QHeaderViewPrivate::_q_sectionsAboutToBeChanged() layoutChangePersistentSections.clear(); layoutChangePersistentSections.reserve(std::min(10, sectionItems.count())); // after layoutChanged another section can be last stretched section - if (stretchLastSection) { + if (stretchLastSection && lastSectionLogicalIdx >= 0 && lastSectionLogicalIdx < sectionItems.count()) { const int visual = visualIndex(lastSectionLogicalIdx); - sectionItems[visual].size = lastSectionSize; + if (visual >= 0 && visual < sectionItems.size()) { + sectionItems[visual].size = lastSectionSize; + } } for (int i = 0; i < sectionItems.size(); ++i) { auto s = sectionItems.at(i); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 97aa8a0299..812ca4b223 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -2363,6 +2363,7 @@ void tst_QHeaderView::checkLayoutChangeEmptyModel() QtTestModel tm; tm.cols = 11; QTableView tv; + tv.verticalHeader()->setStretchLastSection(true); tv.setModel(&tm); const int section4Size = tv.horizontalHeader()->sectionSize(4) + 1; |