[Pkg-xfce-commits] r3918 - in goodies/trunk/xfce4-clipman-plugin/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-03-28 14:02:54 +0000 (Sun, 28 Mar 2010)
New Revision: 3918

Added:
   goodies/trunk/xfce4-clipman-plugin/debian/patches/
   goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
Modified:
   goodies/trunk/xfce4-clipman-plugin/debian/changelog
   goodies/trunk/xfce4-clipman-plugin/debian/rules
Log:
* debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch:
  fix crash occurring on panel shutdown. lp: #532537
* debian/rules: include simple-patchsys.mk.

Modified: goodies/trunk/xfce4-clipman-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/changelog	2010-03-28 13:57:27 UTC (rev 3917)
+++ goodies/trunk/xfce4-clipman-plugin/debian/changelog	2010-03-28 14:02:54 UTC (rev 3918)
@@ -1,3 +1,11 @@
+xfce4-clipman-plugin (2:1.1.3-3) UNRELEASED; urgency=low
+
+  * debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch:
+    fix crash occurring on panel shutdown. lp: #532537
+  * debian/rules: include simple-patchsys.mk.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 28 Mar 2010 16:00:50 +0200
+
 xfce4-clipman-plugin (2:1.1.3-2) unstable; urgency=low
 
   * debian/rules:

Added: goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch	                        (rev 0)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch	2010-03-28 14:02:54 UTC (rev 3918)
@@ -0,0 +1,40 @@
+From d06e35ee62a0477adc84b5d7aeb29e348bb0b813 Mon Sep 17 00:00:00 2001
+From: Mike Massonnet <mmassonnet at xfce.org>
+Date: Thu, 7 Jan 2010 00:04:34 +0100
+Subject: [PATCH 01/20] [daemon] Fix possible NULL values (bug #6119 #6120)
+
+As reported, the abrt program detected a possible crash when the default
+cache is used to restore content or fill the selection while it is NULL.
+---
+ daemon/gsd-clipboard-manager.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/gsd-clipboard-manager.c b/daemon/gsd-clipboard-manager.c
+index 494bb44..1edc068 100644
+--- a/daemon/gsd-clipboard-manager.c
++++ b/daemon/gsd-clipboard-manager.c
+@@ -119,7 +119,7 @@ default_clipboard_get_func (GtkClipboard *clipboard,
+         GtkSelectionData *selection_data_cache = NULL;
+ 
+         list = manager->priv->default_cache;
+-        for (; list->next != NULL; list = list->next) {
++        for (; list != NULL && list->next != NULL; list = list->next) {
+                 selection_data_cache = list->data;
+                 if (gtk_selection_data_get_target (selection_data) ==
+                     gtk_selection_data_get_target (selection_data_cache)) {
+@@ -154,8 +154,11 @@ default_clipboard_restore (GsdClipboardManager *manager)
+         GtkSelectionData *sdata;
+         GSList           *list;
+ 
+-        target_list = gtk_target_list_new (NULL, 0);
+         list = manager->priv->default_cache;
++        if (list == NULL) {
++                return;
++        }
++        target_list = gtk_target_list_new (NULL, 0);
+         for (; list->next != NULL; list = list->next) {
+                 sdata = list->data;
+                 gtk_target_list_add (target_list,
+-- 
+1.6.3.3
+

Modified: goodies/trunk/xfce4-clipman-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/rules	2010-03-28 13:57:27 UTC (rev 3917)
+++ goodies/trunk/xfce4-clipman-plugin/debian/rules	2010-03-28 14:02:54 UTC (rev 3918)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 binary-post-install/xfce4-clipman-plugin::
 	-rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.a