Skip to content

Avoid crashing on invalid utf-8 and avoid an extra allocation on logging #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CramBL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid crashing on invalid utf-8 and avoid an extra allocation on logging #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ pub fn handshake(
// Get VERSION
let mut data = Vec::new();
reader.read_until(b'\n', &mut data)?;
trace!("{}", String::from_utf8(data.clone()).unwrap());
trace!("{}", String::from_utf8_lossy(&data));
let msg: ResponseHandshake = serde_json::from_slice(&data)?;
match msg {
ResponseHandshake::Version(v) => {
Expand All @@ -552,7 +552,7 @@ pub fn handshake(
}
_ => {
return Err(GpsdError::UnexpectedGpsdReply(
String::from_utf8(data).unwrap(),
String::from_utf8_lossy(&data).into_owned(),
))
}
}
Expand All @@ -564,21 +564,21 @@ pub fn handshake(
// Get DEVICES
let mut data = Vec::new();
reader.read_until(b'\n', &mut data)?;
trace!("{}", String::from_utf8(data.clone()).unwrap());
trace!("{}", String::from_utf8_lossy(&data));
let msg: ResponseHandshake = serde_json::from_slice(&data)?;
match msg {
ResponseHandshake::Devices(_) => {}
_ => {
return Err(GpsdError::UnexpectedGpsdReply(
String::from_utf8(data).unwrap(),
String::from_utf8_lossy(&data).into_owned(),
))
}
}

// Get WATCH
let mut data = Vec::new();
reader.read_until(b'\n', &mut data)?;
trace!("{}", String::from_utf8(data.clone()).unwrap());
trace!("{}", String::from_utf8_lossy(&data));
let msg: ResponseHandshake = serde_json::from_slice(&data)?;
match msg {
ResponseHandshake::Watch(w) => {
Expand All @@ -588,13 +588,13 @@ pub fn handshake(
w.nmea.unwrap_or(false),
) {
return Err(GpsdError::WatchFail(
String::from_utf8(data).unwrap(),
String::from_utf8_lossy(&data).into_owned(),
));
}
}
_ => {
return Err(GpsdError::UnexpectedGpsdReply(
String::from_utf8(data).unwrap(),
String::from_utf8_lossy(&data).into_owned(),
))
}
}
Expand All @@ -611,7 +611,7 @@ pub fn handshake(
pub fn get_data(reader: &mut dyn io::BufRead) -> Result<ResponseData, GpsdError> {
let mut data = Vec::new();
reader.read_until(b'\n', &mut data)?;
trace!("{}", String::from_utf8(data.clone()).unwrap());
trace!("{}", String::from_utf8_lossy(&data));
let msg: ResponseData = serde_json::from_slice(&data)?;
Ok(msg)
}
Expand Down