[SCM] libkpeople packaging branch, master, updated. b7c0c72c44df06b5dc6e50d6e2f5a416ab077ef5

Diane Trout diane-guest at alioth.debian.org
Tue Oct 1 18:10:45 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkpeople.git;a=commitdiff;h=b7c0c72

The following commit has been merged in the master branch:
commit b7c0c72c44df06b5dc6e50d6e2f5a416ab077ef5
Author: Diane Trout <diane at ghic.org>
Date:   Tue Oct 1 11:09:41 2013 -0700

    Avoid a null pointer access that was causing ktp-contactlist to crash.
---
 debian/patches/catch-crash.patch |   13 +++++++++++++
 debian/patches/series            |    1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/catch-crash.patch b/debian/patches/catch-crash.patch
new file mode 100644
index 0000000..15d5bac
--- /dev/null
+++ b/debian/patches/catch-crash.patch
@@ -0,0 +1,13 @@
+--- a/src/personpluginmanager.cpp
++++ b/src/personpluginmanager.cpp
+@@ -69,7 +69,9 @@
+ {
+     QList<QAction*> actions;
+     Q_FOREACH(AbstractPersonPlugin *plugin, s_instance->plugins) {
+-        actions << plugin->actionsForPerson(person, parent);
++        if (plugin) {
++            actions << plugin->actionsForPerson(person, parent);
++        }
+     }
+     return actions;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1d1cca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+catch-crash.patch

-- 
libkpeople packaging



More information about the pkg-kde-commits mailing list