[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=8de74a6

The following commit has been merged in the master branch:
commit 8de74a6a30d2a18095328c487b5e6a068c14867d
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jun 20 19:40:25 2011 +0200

    Prevent some crashes caused by array index being out of bounds
    
    Reviewed-by: David Edmundson
---
 accounts-model.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/accounts-model.cpp b/accounts-model.cpp
index e8867fc..383c933 100644
--- a/accounts-model.cpp
+++ b/accounts-model.cpp
@@ -265,7 +265,12 @@ bool AccountsModel::setData(const QModelIndex &index, const QVariant &value, int
 QModelIndex AccountsModel::index(int row, int column, const QModelIndex &parent) const
 {
     TreeNode *parentNode = mPriv->node(parent);
-    return createIndex(row, column, parentNode->childAt(row));
+    Q_ASSERT(parentNode);
+    if (row < parentNode->size()) {
+        return createIndex(row, column, parentNode->childAt(row));
+    }
+
+    return QModelIndex();
 }
 
 QModelIndex AccountsModel::index(TreeNode *node) const

-- 
ktp-contact-list packaging