mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-15 01:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use strcpy instead of memcpy+strlen."

Browse Source 
This reverts commit 119c200e00.
This commit is contained in:
Reece H. Dunn
2017-11-04 08:14:59 +00:00
parent 0c03763dc3
commit 50a2d8e291
5 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-1
View File
@@ -98,7 +98,6 @@ src/speak-ng
tests/*.test
!tests/languages.test
!tests/phoneme-output.test
espeak-ng.pc
Makefile.am
-1
View File
@@ -250,7 +250,6 @@ tests_api_test_SOURCES = tests/api.c
check: tests/encoding.check \
tests/readclause.check \
tests/api.check \
tests/phoneme-output.check \
tests/languages.check
##### phoneme data:
src/libespeak-ng/dictionary.c
+2 -2
View File
@@ -2392,7 +2392,7 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
match1.end_type |= p - p_start;
}
strcpy(end_phonemes, match1.phonemes);
strcpy(p_start, word_copy);
memcpy(p_start, word_copy, strlen(word_copy));
return match1.end_type;
}
}
@@ -2402,7 +2402,7 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
}
}
strcpy(p_start, word_copy);
memcpy(p_start, word_copy, strlen(word_copy));
return 0;
}
src/libespeak-ng/translate.c
+6 -6
View File
@@ -827,7 +827,7 @@ static int TranslateWord3(Translator *tr, char *word_start, WORD_TAB *wtab, char
if (end2) {
RemoveEnding(tr, wordx, end2, word_copy);
end_type = TranslateRules(tr, wordx, phonemes, N_WORD_PHONEMES, end_phonemes, wflags|FLAG_NO_TRACE, dictionary_flags);
strcpy(wordx, word_copy);
memcpy(wordx, word_copy, strlen(word_copy));
if ((end_type & SUFX_P) == 0) {
// after removing the suffix, the prefix is no longer recognised.
// Keep the suffix, but don't use the prefix
@@ -934,7 +934,7 @@ static int TranslateWord3(Translator *tr, char *word_start, WORD_TAB *wtab, char
wordx[-1] = ' ';
if (phonemes[0] == phonSWITCH) {
// change to another language in order to translate this word
strcpy(wordx, word_copy);
memcpy(wordx, word_copy, strlen(word_copy));
strcpy(word_phonemes, phonemes);
return 0;
}
@@ -952,7 +952,7 @@ static int TranslateWord3(Translator *tr, char *word_start, WORD_TAB *wtab, char
found = LookupDictList(tr, &wordx, phonemes, dictionary_flags2, end_flags, wtab); // without prefix and suffix
if (phonemes[0] == phonSWITCH) {
// change to another language in order to translate this word
strcpy(wordx, word_copy);
memcpy(wordx, word_copy, strlen(word_copy));
strcpy(word_phonemes, phonemes);
return 0;
}
@@ -992,7 +992,7 @@ static int TranslateWord3(Translator *tr, char *word_start, WORD_TAB *wtab, char
if (phonemes[0] == phonSWITCH) {
// change to another language in order to translate this word
strcpy(word_phonemes, phonemes);
strcpy(wordx, word_copy);
memcpy(wordx, word_copy, strlen(word_copy));
wordx[-1] = c_temp;
return 0;
}
@@ -1006,7 +1006,7 @@ static int TranslateWord3(Translator *tr, char *word_start, WORD_TAB *wtab, char
AppendPhonemes(tr, phonemes, N_WORD_PHONEMES, end_phonemes);
end_phonemes[0] = 0;
}
strcpy(wordx, word_copy);
memcpy(wordx, word_copy, strlen(word_copy));
}
wordx[-1] = c_temp;
@@ -1171,7 +1171,7 @@ int TranslateWord(Translator *tr, char *word_start, WORD_TAB *wtab, char *word_o
char word[N_WORD_BYTES+1];
word[0] = 0;
word[1] = ' ';
strcpy(word+2, word_out);
memcpy(word+2, word_out, strlen(word_out));
word_out = word+2;
while (*word_out && available > 1) {
tests/phoneme-output.test
-21
View File
@@ -1,21 +0,0 @@
#!/bin/sh
test_phonemes() {
TEST_LANG=$1
EXPECTED=$2
TEST_TEXT=$3
echo "testing ${TEST_LANG} \"${TEST_TEXT}\""
ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} \
src/espeak-ng -xq -v ${TEST_LANG} "${TEST_TEXT}" > actual.txt
echo "${EXPECTED}" > expected.txt
diff expected.txt actual.txt || exit 1
}
test_phonemes en " h@l'oU" "hello"
# Emoji
# ED-3 - emoji_character [http://www.unicode.org/reports/tr51/tr51-12.html#def_emoji_character]
test_phonemes en " Ekskla#m'eIS@N kw'EstS@n m'A@k" "⁉"
test_phonemes en " Ekskla#m'eIS@N kw'EstS@n m'A@k r'eInboU" "⁉ 🌈"