From e68c90aa37da6f0eb97f658e58dbb384325cdad2 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 27 Apr 2010 11:07:46 +1000
Subject: Don't crash on invalid model remove signal.

Task-number: QTBUG-10209
---
 src/declarative/graphicsitems/qdeclarativerepeater.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index 95f6276..d49bb02 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -346,21 +346,26 @@ void QDeclarativeRepeater::itemsInserted(int index, int count)
 void QDeclarativeRepeater::itemsRemoved(int index, int count)
 {
     Q_D(QDeclarativeRepeater);
-    if (!isComponentComplete())
+    if (!isComponentComplete() || count <= 0)
         return;
     while (count--) {
         QDeclarativeItem *item = d->deletables.takeAt(index);
-        if (item) {
+        if (item)
             d->model->release(item);
-        }
+        else
+            break;
     }
 }
 
 void QDeclarativeRepeater::itemsMoved(int from, int to, int count)
 {
     Q_D(QDeclarativeRepeater);
-    if (!isComponentComplete())
+    if (!isComponentComplete() || count <= 0)
         return;
+    if (from + count > d->deletables.count()) {
+        regenerate();
+        return;
+    }
     QList<QDeclarativeItem*> removed;
     int removedCount = count;
     while (removedCount--)
-- 
cgit v0.12