Add upstream patch fixing an USB redirection crash
Resolves: rhbz#1182226
This commit is contained in:
parent
74d0593504
commit
949e26e6be
@ -0,0 +1,31 @@
|
|||||||
|
From e3932bfebbfec7637f3d03d90e8f9b75e3223236 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pavel Grunt <pgrunt@redhat.com>
|
||||||
|
Date: Wed, 11 Mar 2015 16:31:39 +0100
|
||||||
|
Subject: [spice-gtk] channel-usbredir: Do not stop event listening if
|
||||||
|
SpiceSession does not exist
|
||||||
|
|
||||||
|
Avoids Segfault when closing the connection just after the usb device redirection.
|
||||||
|
---
|
||||||
|
gtk/channel-usbredir.c | 9 ++++++---
|
||||||
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gtk/channel-usbredir.c b/gtk/channel-usbredir.c
|
||||||
|
index b1a91fb..d974434 100644
|
||||||
|
--- a/gtk/channel-usbredir.c
|
||||||
|
+++ b/gtk/channel-usbredir.c
|
||||||
|
@@ -419,9 +419,12 @@ void spice_usbredir_channel_disconnect_device(SpiceUsbredirChannel *channel)
|
||||||
|
* usbredirhost_set_device NULL will interrupt the
|
||||||
|
* libusb_handle_events call in the thread.
|
||||||
|
*/
|
||||||
|
- spice_usb_device_manager_stop_event_listening(
|
||||||
|
- spice_usb_device_manager_get(
|
||||||
|
- spice_channel_get_session(SPICE_CHANNEL(channel)), NULL));
|
||||||
|
+ {
|
||||||
|
+ SpiceSession *session = spice_channel_get_session(SPICE_CHANNEL(channel));
|
||||||
|
+ if (session != NULL)
|
||||||
|
+ spice_usb_device_manager_stop_event_listening(
|
||||||
|
+ spice_usb_device_manager_get(session, NULL));
|
||||||
|
+ }
|
||||||
|
/* This also closes the libusb handle we passed from open_device */
|
||||||
|
usbredirhost_set_device(priv->host, NULL);
|
||||||
|
libusb_unref_device(priv->device);
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: spice-gtk
|
Name: spice-gtk
|
||||||
Version: 0.28
|
Version: 0.28
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A GTK+ widget for SPICE clients
|
Summary: A GTK+ widget for SPICE clients
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -10,6 +10,7 @@ License: LGPLv2+
|
|||||||
URL: http://spice-space.org/page/Spice-Gtk
|
URL: http://spice-space.org/page/Spice-Gtk
|
||||||
#VCS: git:git://anongit.freedesktop.org/spice/spice-gtk
|
#VCS: git:git://anongit.freedesktop.org/spice/spice-gtk
|
||||||
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
|
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
|
||||||
|
Patch0: 0001-channel-usbredir-Do-not-stop-event-listening-if-Spic.patch
|
||||||
|
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: gtk2-devel >= 2.14
|
BuildRequires: gtk2-devel >= 2.14
|
||||||
@ -134,6 +135,7 @@ if [ -n '%{?_version_suffix}' ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
pushd spice-gtk-%{version}
|
pushd spice-gtk-%{version}
|
||||||
|
%patch0 -p1
|
||||||
find . -name '*.stamp' | xargs touch
|
find . -name '*.stamp' | xargs touch
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -252,6 +254,10 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
|
|||||||
%{_bindir}/spicy-stats
|
%{_bindir}/spicy-stats
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 31 2015 Christophe Fergeau <cfergeau@redhat.com> 0.28-2
|
||||||
|
- Add upstream patch fixing an USB redirection crash
|
||||||
|
Resolves: rhbz#1182226
|
||||||
|
|
||||||
* Wed Mar 4 2015 Marc-André Lureau <marcandre.lureau@redhat.com> 0.28-1
|
* Wed Mar 4 2015 Marc-André Lureau <marcandre.lureau@redhat.com> 0.28-1
|
||||||
- Update to spice-gtk v0.28
|
- Update to spice-gtk v0.28
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user