[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=ccd4d13

The following commit has been merged in the master branch:
commit ccd4d133ba4becb7c8662eb3e57612e8aa9773e4
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Apr 10 20:58:47 2014 +0200

    Don't crash when TelepathyLoggerQt4 returns a null TextEvent
    
    Tpl::PendingEvents sometimes returns a list of events that includes a null
    event, which leads to a crash when we try to dereference it (either by
    hitting an assert in QtGlib, or by calling methods on a null pointer).
    
    BUG: 331104
    FIXED-IN: 0.8.1
---
 KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp b/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
index 6990d5f..d989d86 100644
--- a/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
+++ b/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
@@ -60,6 +60,11 @@ void PendingTpLoggerLogs::logsRetrieved(Tpl::PendingOperation *op)
     QList<KTp::LogMessage> logs;
     Q_FOREACH (const Tpl::EventPtr &event, events) {
         const Tpl::TextEventPtr textEvent = event.dynamicCast<Tpl::TextEvent>();
+        if (textEvent.isNull()) {
+            kDebug() << "Received a null TextEvent!";
+            continue;
+        }
+
         logs << KTp::LogMessage(Utils::fromTplEntity(event->sender()),
                                 account(), event->timestamp(), textEvent->message(),
                                 textEvent->messageToken());

-- 
ktp-common-internals packaging