From 28951758263e1512b00ca8e2e91a0cc95d176512 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Tue, 18 Jan 2011 17:00:49 +1000
Subject: Avoid index out of bounds array accesses

---
 src/declarative/graphicsitems/qdeclarativepositioners.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index c4b35a8..b3383ab 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -905,6 +905,9 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
         c = (numVisible+(m_rows-1))/m_rows;
     }
 
+    if(r==0 || c==0)
+        return; //Nothing to do
+
     QList<int> maxColWidth;
     QList<int> maxRowHeight;
     int childIndex =0;
@@ -949,14 +952,14 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
     }
 
     int widthSum = 0;
-    for(int j=0; j < c; j++){
+    for(int j=0; j < maxColWidth.size(); j++){
         if(j)
             widthSum += spacing();
         widthSum += maxColWidth[j];
     }
 
     int heightSum = 0;
-    for(int i=0; i < r; i++){
+    for(int i=0; i < maxRowHeight.size(); i++){
         if(i)
             heightSum += spacing();
         heightSum += maxRowHeight[i];
-- 
cgit v0.12