Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Matthias Clasen
f50002d7bc bump rev 2013-06-10 23:10:49 -04:00
Matthias Clasen
8779c08514 Fix a crash
Conflicts:
	vino.spec
2013-06-10 23:08:09 -04:00
Matthias Clasen
c0350239d3 fix a crash when clicking on the statusicon 2012-12-02 22:11:58 -05:00
2 changed files with 45 additions and 2 deletions

32
vino-allocation.patch Normal file
View file

@ -0,0 +1,32 @@
From 81b5e3780f69e7a3c465afbe6cae9712d47c7deb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 25 May 2013 00:52:07 -0400
Subject: [PATCH] Be more careful with memory allocation
Better to 0-initialize these structs, since GetValidIGD may
not end up filling them.
See https://bugzilla.redhat.com/attachment.cgi?id=707491
for a related stacktrace.
https://bugzilla.gnome.org/show_bug.cgi?id=700987
---
server/vino-upnp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/vino-upnp.c b/server/vino-upnp.c
index fcccfc7..99d7a71 100644
--- a/server/vino-upnp.c
+++ b/server/vino-upnp.c
@@ -91,8 +91,8 @@ update_upnp_status (VinoUpnp *upnp)
dprintf (UPNP, "found.\n");
dprintf (UPNP, "UPnP: Looking for a valid IGD... ");
- upnp->priv->urls = g_new (struct UPNPUrls, 1);
- upnp->priv->data = g_new (struct IGDdatas, 1);
+ upnp->priv->urls = g_new0 (struct UPNPUrls, 1);
+ upnp->priv->data = g_new0 (struct IGDdatas, 1);
res = UPNP_GetValidIGD (devlist,
upnp->priv->urls,
--
1.8.2.1

View file

@ -5,11 +5,14 @@
Summary: A remote desktop system for GNOME
Name: vino
Version: 3.6.2
Release: 1%{?dist}
Release: 3%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/vino
Source0: http://download.gnome.org/sources/vino/3.6/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=700987
Patch0: vino-allocation.patch
License: GPLv2+
Group: User Interface/Desktops
@ -34,6 +37,7 @@ connect to a running GNOME session using VNC.
%prep
%setup -q
%patch0 -p1
# autoreconf -i -f
# intltoolize --force
@ -57,7 +61,7 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor gnome --delete-original \
desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \
$RPM_BUILD_ROOT%{_datadir}/applications/vino-preferences.desktop
@ -96,6 +100,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/GConf/gsettings/org.gnome.Vino.convert
%changelog
* Mon Jun 10 2013 Matthias Clasen <mclasen@redhat.com> - 3.6.2-3
- Be more careful with memory allocation
* Sun Dec 2 2012 Matthias Clasen <mclasen@redhat.com> - 3.6.2-2
- Don't add a vendor prefix to the desktop file, that breaks
activating the preferences from the statusicon (#827913)
* Tue Nov 13 2012 Kalev Lember <kalevlember@gmail.com> - 3.6.2-1
- Update to 3.6.2