nolan/speech-dispatcher-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add defensive handling for speaking empty strings, which appears to crash the client.

Browse Source
This commit is contained in:
Nolan Darilek 2019-12-30 09:09:19 -06:00
parent 369bf23fa9
commit 2758f79538
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
speech-dispatcher/src/lib.rs
View File

@ -118,13 +118,21 @@ impl Connection {
} }
pub fn say<S: Into<String>>(&self, priority: Priority, text: S) -> bool { pub fn say<S: Into<String>>(&self, priority: Priority, text: S) -> bool {
let param = CString::new(text.into()).unwrap(); let text: String = text.into();
if text.is_empty() {
return true;
}
let param = CString::new(text).unwrap();
let v = unsafe { spd_say(self.connection, priority as u32, param.as_ptr()) }; let v = unsafe { spd_say(self.connection, priority as u32, param.as_ptr()) };
i32_to_bool(v) i32_to_bool(v)
} }
pub fn sayf<S: Into<String>>(&self, priority: Priority, format: S) -> bool { pub fn sayf<S: Into<String>>(&self, priority: Priority, format: S) -> bool {
let param = CString::new(format.into()).unwrap(); let format: String = format.into();
if format.is_empty() {
return true;
}
let param = CString::new(format).unwrap();
let v = unsafe { spd_sayf(self.connection, priority as u32, param.as_ptr()) }; let v = unsafe { spd_sayf(self.connection, priority as u32, param.as_ptr()) };
i32_to_bool(v) i32_to_bool(v)
} }