[SCM] plasma-workspace packaging branch, master, updated. debian/5.3.2-3-2-gecdf3f1

[Jeremy Lainé]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=ecdf3f1

The following commit has been merged in the master branch:
commit ecdf3f1a793b777f12f0528dff7efc35709db645
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Sun Jul 26 15:07:08 2015 +0200

    Apply patch for #792875
---
 debian/changelog                                   |  5 +++
 .../patches/plasmoid_creation_fix_null_check.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 45abb35..c51a2c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 plasma-workspace (4:5.3.2-4) UNRELEASED; urgency=medium
 
+  [ Felix Geyer ]
   * Make plasma-workspace break kde-window-manager (<= 4:5) instead
     of conflicting with it.
     kde-window-manager is a transitional package now.
 
+  [ Jeremy Lainé ]
+  * Apply patch from Michael Musenbrock to avoid null pointer dereferencing in
+    PlasmoidTask constructor (Closes: #792875).
+
  -- Felix Geyer <fgeyer at debian.org>  Sat, 25 Jul 2015 16:17:06 +0200
 
 plasma-workspace (4:5.3.2-3) unstable; urgency=medium
diff --git a/debian/patches/plasmoid_creation_fix_null_check.patch b/debian/patches/plasmoid_creation_fix_null_check.patch
new file mode 100644
index 0000000..e3badd0
--- /dev/null
+++ b/debian/patches/plasmoid_creation_fix_null_check.patch
@@ -0,0 +1,36 @@
+Description: Fix: dereference-before-null-check
+ The instance m_applet was dereferenced (which can be NULL if loadApplet fails)
+ a few lines before a NULL check to m_applet is done. Moving the NULL check before
+ the dereference to avoid crashing plasmashell.
+Author: Michael Musenbrock <redeamer at gmx.net>
+Bug-Debian: http://bugs.debian.org/792875
+
+--- plasma-workspace-5.3.2.orig/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
++++ plasma-workspace-5.3.2/applets/systemtray/plugin/protocols/plasmoid/plasmoidtask.cpp
+@@ -52,6 +52,13 @@ PlasmoidTask::PlasmoidTask(const QString
+     qCDebug(SYSTEMTRAY) << "Loading applet: " << packageName << appletId;
+ 
+     m_applet = Plasma::PluginLoader::self()->loadApplet(packageName, appletId);
++
++    if (!m_applet) {
++        qCDebug(SYSTEMTRAY) << "Invalid applet taskitem";
++        m_valid = false;
++        return;
++    }
++
+     cont->setImmutability(Plasma::Types::Mutable);
+     cont->addApplet(m_applet);
+     m_applet->setParent(cont);
+@@ -81,12 +88,6 @@ PlasmoidTask::PlasmoidTask(const QString
+     }
+ 
+ 
+-
+-    if (!m_applet) {
+-        qCDebug(SYSTEMTRAY) << "Invalid applet taskitem";
+-        m_valid = false;
+-        return;
+-    }
+     connect(m_applet, &Plasma::Applet::statusChanged, this, &PlasmoidTask::updateStatus);
+ 
+     if (pluginInfo().isValid()) {
diff --git a/debian/patches/series b/debian/patches/series
index 4e24552..56b0abf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kubuntu_startkde-qtpath.diff
 install_missing_header
 plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
 check_signals_defined.diff
+plasmoid_creation_fix_null_check.patch

-- 
plasma-workspace packaging