From 74c5d3e8c9dc099b11f65738ac2bdcb3bdb1f76d Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@fedoraproject.org>
Date: Wed, 10 Oct 2007 20:54:10 +0000
Subject: [PATCH] Fix coroutine cleanup to avoid crash (rhbz #325731)

---
 gtk-vnc-0.2.0-coroutine-cleanup.patch | 22 ++++++++++++++++++++++
 gtk-vnc.spec                          |  7 ++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 gtk-vnc-0.2.0-coroutine-cleanup.patch

diff --git a/gtk-vnc-0.2.0-coroutine-cleanup.patch b/gtk-vnc-0.2.0-coroutine-cleanup.patch
new file mode 100644
index 0000000..0a91123
--- /dev/null
+++ b/gtk-vnc-0.2.0-coroutine-cleanup.patch
@@ -0,0 +1,22 @@
+changeset:   78:8d1799e6a392
+tag:         tip
+user:        "Daniel P. Berrange <berrange@redhat.com>"
+date:        Wed Oct 10 16:38:16 2007 -0400
+files:       src/coroutine.c
+description:
+Clear coroutine caller when exiting coroutine
+
+
+diff -r df7828ad6498 -r 8d1799e6a392 src/coroutine.c
+--- a/src/coroutine.c	Wed Oct 10 10:09:08 2007 -0300
++++ b/src/coroutine.c	Wed Oct 10 16:38:16 2007 -0400
+@@ -28,6 +28,8 @@ static int _coroutine_release(struct con
+ 		if (ret < 0)
+ 			return ret;
+ 	}
++
++	co->caller = NULL;
+ 
+ 	return munmap(cc->stack, cc->stack_size);
+ }
+
diff --git a/gtk-vnc.spec b/gtk-vnc.spec
index f0bbda4..3641eb9 100644
--- a/gtk-vnc.spec
+++ b/gtk-vnc.spec
@@ -3,12 +3,13 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1: %{name}-%{version}-execmem.patch
 Patch2: %{name}-%{version}-coroutine-caller.patch
+Patch3: %{name}-%{version}-coroutine-cleanup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel
@@ -45,6 +46,7 @@ A module allowing use of the GTK-VNC widget from python
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -84,6 +86,9 @@ rm -fr %{buildroot}
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Thu Oct 10 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-4.fc8
+- Fixed coroutine cleanup to avoid SEGV (rhbz #325731)
+
 * Thu Oct  4 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-3.fc8
 - Fixed coroutine caller to avoid SEGV