mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-03 06:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard calls to the synth_callback function, as it might be NULL.

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-16 11:47:27 +00:00
parent 3d55519f27
commit 9a03414e99
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/speech.c
+4 -6
View File
@@ -194,10 +194,8 @@ int sync_espeak_terminated_msg(uint32_t unique_identifier, void *user_data)
break;
usleep(10000);
}
} else {
if (synth_callback)
finished = synth_callback(NULL, 0, event_list);
}
} else if (synth_callback)
finished = synth_callback(NULL, 0, event_list);
return finished;
}
@@ -441,7 +439,7 @@ static espeak_ng_STATUS Synthesize(unsigned int unique_identifier, const void *t
if (finished < 0)
return ENS_AUDIO_ERROR;
#endif
} else
} else if (synth_callback)
finished = synth_callback((short *)outbuf, length, event_list);
if (finished) {
SpeakNextClause(NULL, 0, 2); // stop
@@ -463,7 +461,7 @@ static espeak_ng_STATUS Synthesize(unsigned int unique_identifier, const void *t
if (dispatch_audio(NULL, 0, NULL) < 0)
return ENS_AUDIO_ERROR;
#endif
} else
} else if (synth_callback)
synth_callback(NULL, 0, event_list); // NULL buffer ptr indicates end of data
break;
}