From 746ab5f16d5c297567341797869b124868a926fe Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 2 Oct 2019 15:12:17 +0200
Subject: Remove potential out of bounds accesses to QList

Change-Id: I13431e45ef329921a8846c38047f704a299a1a94
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 src/corelib/animation/qanimationgroup.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/corelib/animation/qanimationgroup.cpp')

diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp
index ed40817222..69e2cfc9bc 100644
--- a/src/corelib/animation/qanimationgroup.cpp
+++ b/src/corelib/animation/qanimationgroup.cpp
@@ -195,8 +195,11 @@ void QAnimationGroup::insertAnimation(int index, QAbstractAnimation *animation)
         return;
     }
 
-    if (QAnimationGroup *oldGroup = animation->group())
+    if (QAnimationGroup *oldGroup = animation->group()) {
         oldGroup->removeAnimation(animation);
+        // ensure we don't insert out of bounds if oldGroup == this
+        index = qMin(index, d->animations.size());
+    }
 
     d->animations.insert(index, animation);
     QAbstractAnimationPrivate::get(animation)->group = this;
-- 
cgit v1.2.1