Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12e4be3b4c | ||
|
|
6b4928869a | ||
|
|
8a7a769dcf |
3 changed files with 49 additions and 7 deletions
29
0001-Don-t-free-SPICE-ticket-twice.patch
Normal file
29
0001-Don-t-free-SPICE-ticket-twice.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From a4e588e3eacf4e5590ff98171a495f8fa0e37375 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <a4e588e3eacf4e5590ff98171a495f8fa0e37375.1355522395.git.crobinso@redhat.com>
|
||||
From: Christophe Fergeau <cfergeau@redhat.com>
|
||||
Date: Mon, 1 Oct 2012 18:22:04 +0200
|
||||
Subject: [PATCH] Don't free SPICE ticket twice
|
||||
|
||||
Commit 2201a5a was supposed to free a SPICE ticket leak, but it's
|
||||
actually introducing a double-free as the SPICE ticket is
|
||||
unconditionally freed at the end of
|
||||
virt_viewer_session_spice_main_channel_event
|
||||
---
|
||||
src/virt-viewer-session-spice.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
|
||||
index 5fcd7fb..2577f2b 100644
|
||||
--- a/src/virt-viewer-session-spice.c
|
||||
+++ b/src/virt-viewer-session-spice.c
|
||||
@@ -326,7 +326,6 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
|
||||
gboolean openfd;
|
||||
|
||||
g_object_set(self->priv->session, "password", password, NULL);
|
||||
- g_free(password);
|
||||
g_object_get(self->priv->session, "client-sockets", &openfd, NULL);
|
||||
|
||||
if (openfd)
|
||||
--
|
||||
1.8.0.2
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
69a7c6d5cbd23d478396da4883567261 virt-viewer-0.5.3.tar.gz
|
||||
43c269da571e65b12421b6fc9f871e98 virt-viewer-0.5.4.tar.gz
|
||||
|
|
|
|||
|
|
@ -18,19 +18,21 @@
|
|||
%define with_spice 1
|
||||
%endif
|
||||
|
||||
# spice-gtk is x86 x86_64 only currently:
|
||||
%ifnarch %{ix86} x86_64
|
||||
# spice-gtk is x86 x86_64 arm only currently:
|
||||
%ifnarch %{ix86} x86_64 %{arm}
|
||||
%define with_spice 0
|
||||
%endif
|
||||
|
||||
Name: virt-viewer
|
||||
Version: 0.5.3
|
||||
Release: 6%{?dist}%{?extra_release}
|
||||
Version: 0.5.4
|
||||
Release: 3%{?dist}%{?extra_release}
|
||||
Summary: Virtual Machine Viewer
|
||||
Group: Applications/System
|
||||
License: GPLv2+
|
||||
URL: http://virt-manager.org/
|
||||
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
|
||||
# Fix crash after entering spice password (bz 880381)
|
||||
Patch1: 0001-Don-t-free-SPICE-ticket-twice.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: openssh-clients
|
||||
Requires(post): %{_sbindir}/update-alternatives
|
||||
|
|
@ -38,6 +40,7 @@ Requires(postun): %{_sbindir}/update-alternatives
|
|||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
|
||||
BuildRequires: glib2-devel >= 2.22
|
||||
%if %{with_gtk3}
|
||||
BuildRequires: gtk3-devel >= 3.0.0
|
||||
%else
|
||||
|
|
@ -52,9 +55,9 @@ BuildRequires: gtk-vnc-devel >= 0.3.8
|
|||
%endif
|
||||
%if %{with_spice}
|
||||
%if %{with_gtk3}
|
||||
BuildRequires: spice-gtk3-devel >= 0.11
|
||||
BuildRequires: spice-gtk3-devel >= 0.12.101
|
||||
%else
|
||||
BuildRequires: spice-gtk-devel >= 0.11
|
||||
BuildRequires: spice-gtk-devel >= 0.12.101
|
||||
%endif
|
||||
BuildRequires: spice-protocol >= 0.10.1
|
||||
%endif
|
||||
|
|
@ -90,6 +93,7 @@ browsers.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -171,6 +175,15 @@ update-desktop-database -q %{_datadir}/applications
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Dec 14 2012 Cole Robinson <crobinso@redhat.com> - 0.5.4-3
|
||||
- Fix crash after entering spice password (bz #880381)
|
||||
|
||||
* Sat Oct 13 2012 Chris Tyler <chris@tylers.info> - 0.5.4-2
|
||||
- Enabled spice support for ARM archs
|
||||
|
||||
* Mon Sep 17 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.4-1
|
||||
- Update to 0.5.4 release
|
||||
|
||||
* Fri Sep 14 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-6
|
||||
- Rebuild for spice-gtk ABI breakage (previous spice-gtk build was borked)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue