Fix a crash in the festival module

This commit is contained in:
Matthias Clasen 2013-11-02 00:02:45 -04:00
parent 532f62b391
commit 20ced9f075
2 changed files with 19 additions and 1 deletions

View File

@ -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)

13
thread-cancel-crash.patch Normal file
View File

@ -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);