You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.2 KiB
31 lines
1.2 KiB
2 years ago
|
From 44ac7f39d874202163926f505a46179c084154b9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maximilian Goldstein <max.goldstein@qt.io>
|
||
|
|
Date: Tue, 23 Feb 2021 16:10:44 +0100
|
||
|
|
Subject: [PATCH 13/20] qqmldelegatemodel: Fix out of bounds cache removal
|
||
|
|
|
||
|
|
Pick-to: 5.15 6.0 6.1
|
||
|
|
Task-number: QTBUG-91276
|
||
|
|
Change-Id: I1ddbb4a3326d61ff94e3881beb64a14dade11c46
|
||
|
|
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
||
|
|
(cherry picked from commit 31ad81d81e623a34cd71567b9507f16601f1c1d4)
|
||
|
|
---
|
||
|
|
src/qmlmodels/qqmldelegatemodel.cpp | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
|
||
|
|
index 381726291d..53e511303e 100644
|
||
|
|
--- a/src/qmlmodels/qqmldelegatemodel.cpp
|
||
|
|
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
|
||
|
|
@@ -1621,7 +1621,7 @@ void QQmlDelegateModelPrivate::itemsRemoved(
|
||
|
|
removed[i] = 0;
|
||
|
|
|
||
|
|
for (const Compositor::Remove &remove : removes) {
|
||
|
|
- for (; cacheIndex < remove.cacheIndex; ++cacheIndex)
|
||
|
|
+ for (; cacheIndex < remove.cacheIndex && cacheIndex < m_cache.size(); ++cacheIndex)
|
||
|
|
incrementIndexes(m_cache.at(cacheIndex), m_groupCount, removed);
|
||
|
|
|
||
|
|
for (int i = 1; i < m_groupCount; ++i) {
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|