Control: tag -1 +patch
Control: severity -1 important

Hi Liang Guo,

Christophe Fergeau:
> This is most likely the crash fixed by this upstream commit:
> https://cgit.freedesktop.org/spice/spice-gtk/commit/?id=03c016bea939ee4a26e90d80fa1012a993a8ea47

I've been affected by this bug for a while, which made my usage of
virt-manager a pain. Applying this commit on top of spice-gtk 0.33-3
made the problem go away. I would really like this to be fixed in
Stretch, so I intend to NMU this package to delayed+5 (diff attached),
so that 0.33-3.1 has a chance to migrate to testing before my upload
reaches sid.

What do you think?

(I'd like to fix #797855 in time for Stretch as well, but that'll be
for another day.)

Cheers,
-- 
intrigeri

diff -Nru spice-gtk-0.33/debian/changelog spice-gtk-0.33/debian/changelog
--- spice-gtk-0.33/debian/changelog	2016-12-10 16:06:07.000000000 +0100
+++ spice-gtk-0.33/debian/changelog	2016-12-22 13:45:38.000000000 +0100
@@ -1,3 +1,11 @@
+spice-gtk (0.33-3.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * debian_843471-clipboard_Fix_crash_by_handling_error.patch:
+    new patch, cherry-picked from upstream (Closes: #843471).
+
+ -- intrigeri <[email protected]>  Thu, 22 Dec 2016 12:45:38 +0000
+
 spice-gtk (0.33-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru spice-gtk-0.33/debian/patches/debian_843471-clipboard_Fix_crash_by_handling_error.patch spice-gtk-0.33/debian/patches/debian_843471-clipboard_Fix_crash_by_handling_error.patch
--- spice-gtk-0.33/debian/patches/debian_843471-clipboard_Fix_crash_by_handling_error.patch	1970-01-01 01:00:00.000000000 +0100
+++ spice-gtk-0.33/debian/patches/debian_843471-clipboard_Fix_crash_by_handling_error.patch	2016-12-22 13:45:07.000000000 +0100
@@ -0,0 +1,40 @@
+commit 03c016bea939ee4a26e90d80fa1012a993a8ea47
+Author: Victor Toso <[email protected]>
+Origin: upstream, https://cgit.freedesktop.org/spice/spice-gtk/commit/?id=03c016bea939ee4a26e90d80fa1012a993a8ea47
+Bug-Debian: https://bugs.debian.org/843471
+Date:   Fri Oct 14 18:12:01 2016 +0200
+
+    clipboard: Fix crash by handling error
+    
+    As manual states below, text could be NULL for different reasons and
+    we should handle that. I've included a debug message to help
+    identifying possible regressions from wayland's clipboard.
+    
+    This crash is a regression from 7b0de6217670e0f668aff2949f
+    
+     "The text parameter to callback will contain the resulting text if
+     the request succeeded, or NULL if it failed. This could happen for
+     various reasons, in particular if the clipboard was empty or if the
+     contents of the clipboard could not be converted into text form."
+    
+    Resolves: rhbz#1384676
+    
+    Signed-off-by: Victor Toso <[email protected]>
+    Acked-by: Pavel Grunt <[email protected]>
+
+diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
+index 3ff4e9a..3e0ec74 100644
+--- a/src/spice-gtk-session.c
++++ b/src/spice-gtk-session.c
+@@ -945,6 +945,11 @@ static void clipboard_received_text_cb(GtkClipboard *clipboard,
+     if (self == NULL)
+         return;
+ 
++    if (text == NULL) {
++        SPICE_DEBUG("Failed to retrieve clipboard text");
++        return;
++    }
++
+     g_return_if_fail(SPICE_IS_GTK_SESSION(self));
+ 
+     selection = get_selection_from_clipboard(self->priv, clipboard);
diff -Nru spice-gtk-0.33/debian/patches/series spice-gtk-0.33/debian/patches/series
--- spice-gtk-0.33/debian/patches/series	2016-12-10 16:06:07.000000000 +0100
+++ spice-gtk-0.33/debian/patches/series	2016-12-22 13:44:41.000000000 +0100
@@ -1,2 +1,3 @@
 explicitly-enable-subdir-objects.patch
 spice-gtk-get-it-compiled-against-openssl-1.1.0.patch
+debian_843471-clipboard_Fix_crash_by_handling_error.patch

Reply via email to