mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-05 22:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

espeakengine: avoid leaking memory from currentLanguage.

Browse Source
This commit is contained in:
Reece H. Dunn
2012-12-16 18:11:45 +00:00
parent f45a01b8e0
commit 4529991fe4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/jni/jni/espeakengine.cpp
+3 -3
View File
@@ -121,10 +121,10 @@ const int NUM_SUPPORTED_VOICES = 55;
// Callback to the TTS API
synthDoneCB_t *ttsSynthDoneCBPointer;
char *currentLanguage = (char *) "en-us";
char *currentRate = (char *) "150";
char *eSpeakDataPath = NULL;
char currentLanguage[33];
char currentLang[10];
char currentCountry[10];
char currentVariant[10];
@@ -217,6 +217,7 @@ tts_result attemptInit() {
voice.variant = 0;
espeak_SetVoiceByProperties(&voice);
strcpy(currentLanguage, "en-us");
hasInitialized = true;
return TTS_SUCCESS;
@@ -401,6 +402,7 @@ tts_result TtsEngine::setLanguage(const char *lang, const char *country, const c
return TTS_FAILURE;
}
strcpy(currentLanguage, lang);
strcpy(currentLang, lang);
strcpy(currentCountry, country);
strcpy(currentVariant, variant);
@@ -413,8 +415,6 @@ tts_result TtsEngine::setLanguage(const char *lang, const char *country, const c
voice.variant = 0;
voice.languages = espeakLangStr;
espeak_ERROR err = espeak_SetVoiceByProperties(&voice);
currentLanguage = new char[strlen(lang)];
strcpy(currentLanguage, lang);
if (err != EE_OK) {
LOGE("Error code %d when setting voice properties!", err);