[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=66aea00

The following commit has been merged in the master branch:
commit 66aea0057b666ebc29843f6f1277ad50a0fffbb6
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 12 16:36:58 2013 +0000

    Add guard on adding invalid proxies
---
 KTp/Models/abstract-grouping-proxy-model.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/KTp/Models/abstract-grouping-proxy-model.cpp b/KTp/Models/abstract-grouping-proxy-model.cpp
index 9da6ccc..e85d417 100644
--- a/KTp/Models/abstract-grouping-proxy-model.cpp
+++ b/KTp/Models/abstract-grouping-proxy-model.cpp
@@ -206,8 +206,15 @@ void KTp::AbstractGroupingProxyModel::onRowsInserted(const QModelIndex &sourcePa
     }
 }
 
+#include <KTp/types.h>
+
 void KTp::AbstractGroupingProxyModel::addProxyNode(const QModelIndex &sourceIndex, QStandardItem *parent)
 {
+    Q_ASSERT(sourceIndex.isValid());
+    if (!sourceIndex.isValid()) {
+        return;
+    }
+
     ProxyNode *proxyNode = new ProxyNode(sourceIndex);
     d->proxyMap.insertMulti(sourceIndex, proxyNode);
     parent->appendRow(proxyNode);

-- 
ktp-common-internals packaging