d2e7ff06d7
Resolves: rhbz#1384676
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 68c2d656e3f3d9c6d2027ae8eacf3064a8b88efa Mon Sep 17 00:00:00 2001
|
|
From: Victor Toso <me@victortoso.com>
|
|
Date: Fri, 14 Oct 2016 18:12:01 +0200
|
|
Subject: [PATCH] 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 <victortoso@redhat.com>
|
|
Acked-by: Pavel Grunt <pgrunt@redhat.com>
|
|
(cherry picked from commit 03c016bea939ee4a26e90d80fa1012a993a8ea47)
|
|
---
|
|
src/spice-gtk-session.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
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);
|
|
--
|
|
2.9.3
|
|
|