Browse Source

Don't crash if loading the default voice fails.

master
Reece H. Dunn 8 years ago
parent
commit
fbd2e679fc
2 changed files with 43 additions and 3 deletions
  1. 6
    3
      src/libespeak-ng/speech.c
  2. 37
    0
      tests/api.c

+ 6
- 3
src/libespeak-ng/speech.c View File



count_samples = 0; count_samples = 0;


if (translator == NULL)
espeak_SetVoiceByName("en");
espeak_ng_STATUS status;
if (translator == NULL) {
status = espeak_SetVoiceByName("en");
if (status != ENS_OK)
return status;
}


if (p_decoder == NULL) if (p_decoder == NULL)
p_decoder = create_text_decoder(); p_decoder = create_text_decoder();


espeak_ng_STATUS status;
status = text_decoder_decode_string_multibyte(p_decoder, text, translator->encoding, flags); status = text_decoder_decode_string_multibyte(p_decoder, text, translator->encoding, flags);
if (status != ENS_OK) if (status != ENS_OK)
return status; return status;

+ 37
- 0
tests/api.c View File

assert(p_decoder == NULL); assert(p_decoder == NULL);
} }


void
test_espeak_synth_no_voices(const char *path)
{
printf("testing espeak_Synth in path with no voices\n");

assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Initialize(AUDIO_OUTPUT_RETRIEVAL, 0, path, espeakINITIALIZE_DONT_EXIT) == 22050);
assert(event_list != NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

const char *test = "One two three.";
assert(espeak_Synth(test, strlen(test)+1, 0, POS_CHARACTER, 0, espeakCHARS_AUTO, NULL, NULL) == EE_INTERNAL_ERROR);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Synchronize() == EE_OK);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Terminate() == EE_OK);
assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);
}

int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
char *progdir = strdup(argv[0]);
char *dir = strrchr(progdir, '/');
if (dir != NULL) *dir = 0;

test_espeak_terminate_without_initialize(); test_espeak_terminate_without_initialize();
test_espeak_initialize(); test_espeak_initialize();


test_espeak_synth(); test_espeak_synth();
test_espeak_synth(); // Check that this does not crash when run a second time. test_espeak_synth(); // Check that this does not crash when run a second time.
test_espeak_synth_no_voices(progdir);
test_espeak_synth();

free(progdir);


return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

Loading…
Cancel
Save