|
|
07d9f9 |
From 0cb2f7634a5ddaefc115181ba76702378007b5c4 Mon Sep 17 00:00:00 2001
|
|
|
07d9f9 |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
|
07d9f9 |
Date: Fri, 20 May 2016 15:45:43 +0200
|
|
|
07d9f9 |
Subject: [PATCH 19/19] channel: check if channel has a session
|
|
|
07d9f9 |
MIME-Version: 1.0
|
|
|
07d9f9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
07d9f9 |
Content-Transfer-Encoding: 8bit
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Since 8943d2329, the channel may be disconnected from the session
|
|
|
07d9f9 |
before it's destroyed. In this case, session is NULL.
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Fixes some critical with virt-manager when closing a display:
|
|
|
07d9f9 |
|
|
|
07d9f9 |
(virt-manager:20451): GSpice-CRITICAL **: spice_session_is_for_migration: assertion 'SPICE_IS_SESSION(session)' failed
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
|
|
|
07d9f9 |
Acked-by: Pavel Grunt <pgrunt@redhat.com>
|
|
|
07d9f9 |
(cherry picked from commit 73564cc1007a7c14e6c79dec67e99458de359898)
|
|
|
07d9f9 |
---
|
|
|
07d9f9 |
src/spice-channel.c | 2 +-
|
|
|
07d9f9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
07d9f9 |
|
|
|
07d9f9 |
diff --git a/src/spice-channel.c b/src/spice-channel.c
|
|
|
07d9f9 |
index fdc0e97..0d9e85a 100644
|
|
|
07d9f9 |
--- a/src/spice-channel.c
|
|
|
07d9f9 |
+++ b/src/spice-channel.c
|
|
|
07d9f9 |
@@ -2314,7 +2314,7 @@ static gboolean spice_channel_delayed_unref(gpointer data)
|
|
|
07d9f9 |
c->state = SPICE_CHANNEL_STATE_UNCONNECTED;
|
|
|
07d9f9 |
|
|
|
07d9f9 |
session = spice_channel_get_session(channel);
|
|
|
07d9f9 |
- if (spice_session_is_for_migration(session)) {
|
|
|
07d9f9 |
+ if (session && spice_session_is_for_migration(session)) {
|
|
|
07d9f9 |
/* error during migration - abort migration */
|
|
|
07d9f9 |
spice_session_abort_migration(session);
|
|
|
07d9f9 |
return FALSE;
|
|
|
07d9f9 |
--
|
|
|
07d9f9 |
2.9.2
|
|
|
07d9f9 |
|