[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.7.4-3-2-g60e152d

[Pino Toscano]

The following commit has been merged in the master branch:
commit 60e152daee95cef206b3db6d1fd5014c8c15c250
Author: Pino Toscano <pino at debian.org>
Date:   Fri Mar 9 16:48:21 2012 +0100

    add patch upstream_better-check-for-return-values-of-m_protocols.value.patch
    
    backport the upstream commit d1edc0f038818a073488f6a1822cfb01d43d67e4 to fix a crash in KIO in some situations, like with proxies with kmail or akonadi
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...ck-for-return-values-of-m_protocols.value.patch |   30 ++++++++++++++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08b304a..28a3aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kde4libs (4:4.7.4-4) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport the upstream commit d1edc0f038818a073488f6a1822cfb01d43d67e4 to fix
+    a crash in KIO in some situations, like with proxies with kmail or akonadi
+    (patch upstream_better-check-for-return-values-of-m_protocols.value.patch).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 16:41:27 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 0395be1..eed5b71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ findpythonlibrary_layout_deb_on_debian.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
+upstream_better-check-for-return-values-of-m_protocols.value.patch
diff --git a/debian/patches/upstream_better-check-for-return-values-of-m_protocols.value.patch b/debian/patches/upstream_better-check-for-return-values-of-m_protocols.value.patch
new file mode 100644
index 0000000..3e64259
--- /dev/null
+++ b/debian/patches/upstream_better-check-for-return-values-of-m_protocols.value.patch
@@ -0,0 +1,30 @@
+From d1edc0f038818a073488f6a1822cfb01d43d67e4 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Fri, 9 Mar 2012 16:16:45 +0100
+Subject: [PATCH] better check for return values of m_protocols.value(...)
+
+This is a better fix for such situation in SchedulerPrivate::assignJobToSlave(), as a followup of
+777f69880989d87adfe3011cf0b8db93f70a626c
+
+BUG: 282889
+FIXED-IN: 4.8.2
+---
+ kio/kio/scheduler.cpp |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+--- a/kio/kio/scheduler.cpp
++++ b/kio/kio/scheduler.cpp
+@@ -1271,8 +1271,11 @@ bool SchedulerPrivate::assignJobToSlave(
+     kDebug(7006) << slave << job;
+     // KDE5: queueing of jobs can probably be removed, it provides very little benefit
+     ProtoQueue *pq = m_protocols.value(slave->protocol());
+-    pq->removeJob(job);
+-    return (pq ? pq->m_connectedSlaveQueue.queueJob(job, slave) : false);
++    if (pq) {
++        pq->removeJob(job);
++        return pq->m_connectedSlaveQueue.queueJob(job, slave);
++    }
++    return false;
+ }
+ 
+ bool SchedulerPrivate::disconnectSlave(KIO::Slave *slave)

-- 
KDE Development Platform Libraries module packaging