Author: alexander
Date: 2007-09-30 07:51:01 -0600 (Sun, 30 Sep 2007)
New Revision: 2088
Modified:
trunk/packages/espeak/espeak-1.29-dont-crash.patch
Log:
Replaced my hack with the upstream change
Modified: trunk/packages/espeak/espeak-1.29-dont-crash.patch
===================================================================
--- trunk/packages/espeak/espeak-1.29-dont-crash.patch 2007-09-30 11:35:44 UTC
(rev 2087)
+++ trunk/packages/espeak/espeak-1.29-dont-crash.patch 2007-09-30 13:51:01 UTC
(rev 2088)
@@ -1,16 +1,11 @@
-The "fix" is surely wrong (why did phoneme_tab[final_ph] become NULL in the
-first place?), but it does prevent the crash when using espeak with the
-Russian voice.
-diff -ur espeak-1.29-source.orig/src/dictionary.cpp
espeak-1.29-source/src/dictionary.cpp
---- espeak-1.29-source.orig/src/dictionary.cpp 2007-09-30 17:16:23.000000000
+0600
-+++ espeak-1.29-source/src/dictionary.cpp 2007-09-30 17:17:12.000000000
+0600
-@@ -1109,6 +1109,9 @@
- stressed_syllable = vowel_count - 3;
- if(vowel_count < 16)
- {
-+ if(phoneme_tab[final_ph] == NULL)
-+ stressed_syllable =
guess_ru[vowel_count];
-+ else
- if(phoneme_tab[final_ph]->type == phVOWEL)
- stressed_syllable =
guess_ru_v[vowel_count];
- else
+--- espeak-1.29-source/src/dictionary.cpp 2007-09-30 19:36:21.000000000
+0600
++++ espeak-1.29-source/src/dictionary.cpp 2007-09-30 18:29:51.000000000
+0600
+@@ -966,6 +965,7 @@
+ if(phonetic[ix] == 0)
+ break;
+ }
++ if(ix == 0) return;
+ final_ph = phonetic[ix-1];
+
+ max_output = output + (N_WORD_PHONEMES-3); /* check for overrun */
+
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
