From 20ced9f0750db3f65f49d140fbd1158a87ee9606 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Nov 02 2013 04:02:45 +0000
Subject: Fix a crash in the festival module


---

diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index e76f990..7a2bfb4 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -1,6 +1,6 @@
 Name:          speech-dispatcher
 Version:       0.8
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       To provide a high-level device independent layer for speech synthesis
 Group:         System Environment/Libraries
 
@@ -13,6 +13,7 @@ Source0:       http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.
 Source1:       http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
 Source2:       speech-dispatcherd.service
 Patch0: 0001-RPM-Cleanups.patch
+Patch1: thread-cancel-crash.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: dotconf-devel
@@ -89,6 +90,7 @@ Python 3 module for speech-dispatcher
 
 %prep
 %setup -q
+%patch1 -p1 -b .crash
 #%patch0 -p1
 #autoreconf -vif
 
@@ -205,6 +207,9 @@ fi
 %{python3_sitearch}/speechd*
 
 %changelog
+* Fri Nov  1 2013 Matthias Clasen <mclasen@redhat.com> 0.8-6
+- Avoid a crash in the festival module (#995639)
+
 * Tue Aug 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 0.8-5
 - Install clients as not longer installed by default (fixes RHBZ 996337)
 
diff --git a/thread-cancel-crash.patch b/thread-cancel-crash.patch
new file mode 100644
index 0000000..16e55da
--- /dev/null
+++ b/thread-cancel-crash.patch
@@ -0,0 +1,13 @@
+diff -up speech-dispatcher-0.8/src/modules/festival.c.cancel speech-dispatcher-0.8/src/modules/festival.c
+--- speech-dispatcher-0.8/src/modules/festival.c.cancel	2013-11-01 23:27:26.912804470 -0400
++++ speech-dispatcher-0.8/src/modules/festival.c	2013-11-01 23:27:03.688847395 -0400
+@@ -469,7 +469,8 @@ int module_close(void)
+ 	// festivalClose(festival_info);
+ 
+ 	DBG("Terminating threads");
+-	module_terminate_thread(festival_speak_thread);
++	if (festival_speak_thread)
++		module_terminate_thread(festival_speak_thread);
+ 
+ 	if (festival_info)
+ 		delete_FT_Info(festival_info);