[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock gtk-vnc 0.4.1-3



Please unblock gtk-vnc 0.4.1-3. I just added an upstream patch to fix a bug 
that was causing memory corruption and then a crash. This bug is described in 
#596447.

diff -u gtk-vnc-0.4.1/debian/control gtk-vnc-0.4.1/debian/control
--- gtk-vnc-0.4.1/debian/control
+++ gtk-vnc-0.4.1/debian/control
@@ -1,8 +1,10 @@
 Source: gtk-vnc
 Section: gnome
 Priority: optional
-Maintainer: Guido Günther <agx@sigxcpu.org>
-Standards-Version: 3.9.0
+Maintainer: Debian Libvirt Maintainers <pkg-libvirt-
maintainers@lists.alioth.debian.org>
+Uploaders: Guido Günther <agx@sigxcpu.org>, Laurent Léonard <laurent@open-
minds.org>
+DM-Upload-Allowed: yes
+Standards-Version: 3.9.1
 Build-Depends: cdbs,
  debhelper (>= 7),
  python-support,
diff -u gtk-vnc-0.4.1/debian/changelog gtk-vnc-0.4.1/debian/changelog
--- gtk-vnc-0.4.1/debian/changelog
+++ gtk-vnc-0.4.1/debian/changelog
@@ -1,3 +1,14 @@
+gtk-vnc (0.4.1-3) unstable; urgency=low
+
+  [ Laurent Léonard ]
+  * [3e55ef6] New patch 0002-Reset-xmit_buffer-fields-to-fix- reconnect.patch
+  * [66baa3f] Bump Standards-Version to 3.9.1
+
+  [ Guido Günther ]
+  * [629db64] Switch to team maintenance and set DM-Upload-Allowed = yes.
+
+ -- Guido Günther <agx@sigxcpu.org>  Sun, 29 Aug 2010 18:13:39 +0200
+
 gtk-vnc (0.4.1-2) unstable; urgency=low
 
   * [9b54fbb] Switch to dh_pysupport. (Closes: #590365)
diff -u gtk-vnc-0.4.1/debian/patches/series gtk-vnc-0.4.1/debian/patches/series
--- gtk-vnc-0.4.1/debian/patches/series
+++ gtk-vnc-0.4.1/debian/patches/series
@@ -1,0 +2 @@
+0002-Reset-xmit_buffer-fields-to-fix-reconnect.patch
only in patch2:
unchanged:
--- gtk-vnc-0.4.1.orig/debian/patches/0002-Reset-xmit_buffer-fields-to-fix-
reconnect.patch
+++ gtk-vnc-0.4.1/debian/patches/0002-Reset-xmit_buffer-fields-to-fix-
reconnect.patch
@@ -0,0 +1,30 @@
+From: Daniel P. Berrange <dan@berrange.com>
+Date: Sun, 15 Aug 2010 17:30:19 +0000
+Subject: [PATCH] Reset xmit_buffer fields to fix reconnect
+
+If a vnc_connection object was closed and reopened old data in the xmit_buffer 
fields would cause a crash, since it was not re-initialized
+
+Origin: upstream, http://git.gnome.org/browse/gtk-
vnc/commit/?id=55d0ee7ba77e15ac5bcf59ff6160170d5b67784f
+---
+ src/vncconnection.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/vncconnection.c b/src/vncconnection.c
+index 03197de..a4a9835 100644
+--- a/src/vncconnection.c
++++ b/src/vncconnection.c
+@@ -4191,7 +4191,12 @@ static void vnc_connection_close(VncConnection *conn)
+               priv->name = NULL;
+       }
+ 
+-      g_free (priv->xmit_buffer);
++      if (priv->xmit_buffer) {
++              g_free(priv->xmit_buffer);
++              priv->xmit_buffer = NULL;
++              priv->xmit_buffer_size = 0;
++              priv->xmit_buffer_capacity = 0;
++      }
+ 
+       if (priv->cred_username) {
+               g_free(priv->cred_username);
+--

Thank you,
-- 
Laurent Léonard


Reply to: