fly/flightgear
1
0
Fork 0
Code Activity

HTS: Code Maintenance

Browse source 
Resolve logic bug
Strengthen type safety
Prevent buffer overrun
This commit is contained in:
Scott Giese 2021-02-18 23:17:46 -06:00
parent 86ff18e0e6
commit 0555d70a37
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
3rdparty/hts_engine_API/lib/HTS_model.c vendored
View file

@ -76,13 +76,13 @@ static HTS_Boolean HTS_dp_match(const char *string, const char *pattern, size_t
if (string[0] == '\0' && pattern[0] == '\0') if (string[0] == '\0' && pattern[0] == '\0')
return TRUE; return TRUE;
if (pattern[0] == '*') { if (pattern[0] == '*') {
if (HTS_dp_match(string + 1, pattern, pos + 1, max) == 1) if (HTS_dp_match(string + 1, pattern, pos + 1, max) == TRUE)
return TRUE; return TRUE;
else else
return HTS_dp_match(string, pattern + 1, pos, max); return HTS_dp_match(string, pattern + 1, pos, max);
} }
if (string[0] == pattern[0] || pattern[0] == '?') { if (string[0] == pattern[0] || pattern[0] == '?') {
if (HTS_dp_match(string + 1, pattern + 1, pos + 1, max + 1) == 1) if (HTS_dp_match(string + 1, pattern + 1, pos + 1, max + 1) == TRUE)
return TRUE; return TRUE;
} }
@ -1165,7 +1165,7 @@ HTS_Boolean HTS_ModelSet_load(HTS_ModelSet * ms, char **voices, size_t num_voice
if (vector_length[j] != temp_vector_length[j]) if (vector_length[j] != temp_vector_length[j])
error = TRUE; error = TRUE;
for (j = 0; j < ms->num_streams; j++) for (j = 0; j < ms->num_streams; j++)
if (is_msd[j] != is_msd[j]) if (is_msd[j] != temp_is_msd[j])
error = TRUE; error = TRUE;
for (j = 0; j < ms->num_streams; j++) for (j = 0; j < ms->num_streams; j++)
if (num_windows[j] != temp_num_windows[j]) if (num_windows[j] != temp_num_windows[j])
@ -1468,7 +1468,9 @@ HTS_Boolean HTS_ModelSet_load(HTS_ModelSet * ms, char **voices, size_t num_voice
} }
if (gv_off_context != NULL) { if (gv_off_context != NULL) {
sprintf(buff1, "GV-Off { %s }", gv_off_context); snprintf(buff1, HTS_MAXBUFLEN, "GV-Off { %s }", gv_off_context);
buff1[HTS_MAXBUFLEN - 1] = '\0';
gv_off_context_fp = HTS_fopen_from_data((void *) buff1, strlen(buff1) + 1); gv_off_context_fp = HTS_fopen_from_data((void *) buff1, strlen(buff1) + 1);
ms->gv_off_context = (HTS_Question *) HTS_calloc(1, sizeof(HTS_Question)); ms->gv_off_context = (HTS_Question *) HTS_calloc(1, sizeof(HTS_Question));
HTS_Question_initialize(ms->gv_off_context); HTS_Question_initialize(ms->gv_off_context);