r25418 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/10_clipboard_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct 19 23:24:46 2010
New Revision: 25418

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25418
Log:
10_clipboard_crash.patch: stolen from upstream git. Fixes a crash in 
the clipboard manager. Closes: #588308.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/10_clipboard_crash.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=25418&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Tue Oct 19 23:24:46 2010
@@ -2,6 +2,8 @@
 
   * 13_monitor_kfreebsd.patch: new patch. Don’t monitor fdescfs.
     Closes: #594891.
+  * 10_clipboard_crash.patch: stolen from upstream git. Fixes a crash in 
+    the clipboard manager. Closes: #588308.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 20 Oct 2010 00:45:32 +0200
 

Added: desktop/unstable/gnome-settings-daemon/debian/patches/10_clipboard_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/10_clipboard_crash.patch?rev=25418&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/10_clipboard_crash.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/10_clipboard_crash.patch [utf-8] Tue Oct 19 23:24:46 2010
@@ -1,0 +1,26 @@
+From b7a9fd528253af16456cf7c0dc1f48bfd0dcbfbc Mon Sep 17 00:00:00 2001
+From: Krzysztof Klimonda <kklimonda at ubuntu.com>
+Date: Wed, 15 Sep 2010 10:29:17 +0000
+Subject: Check whether XGetWindowProperty returns no items, and return if so.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=628526
+---
+diff --git a/plugins/clipboard/gsd-clipboard-manager.c b/plugins/clipboard/gsd-clipboard-manager.c
+index f8cb7ec..d0d28c3 100644
+--- a/plugins/clipboard/gsd-clipboard-manager.c
++++ b/plugins/clipboard/gsd-clipboard-manager.c
+@@ -599,8 +599,11 @@ convert_clipboard (GsdClipboardManager *manager,
+                                     &type, &format, &nitems, &remaining,
+                                     (unsigned char **) &multiple);
+ 
+-                if (type != XA_ATOM_PAIR)
++                if (type != XA_ATOM_PAIR || nitems == 0) {
++                        if (multiple)
++                                free (multiple);
+                         return;
++                }
+ 
+                 for (i = 0; i < nitems; i += 2) {
+                         rdata = (IncrConversion *) malloc (sizeof (IncrConversion));
+--
+cgit v0.8.3.1

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=25418&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Tue Oct 19 23:24:46 2010
@@ -1,6 +1,7 @@
 01_xrdb.patch
 02_missing_libs.patch
 03_maintainer_mode.patch
+10_clipboard_crash.patch
 12_monitor_network_fs.patch
 13_monitor_kfreebsd.patch
 20_gstreamer.patch