Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/serde/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,12 @@ where
if self.is_ending {
return None;
}
// Only whitespace left: the stream is done (as serde_json's `StreamDeserializer`), not an
// EOF error. A value that starts but is cut short is still an error.
if self.de.parser.skip_space_peek().is_none() {
self.is_ending = true;
return None;
}
let val: Result<T> = self.de.deserialize();
if val.is_err() {
self.is_ending = true;
Expand Down
26 changes: 26 additions & 0 deletions src/serde/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,32 @@ mod test {
assert_eq!(expect, got);
}

#[test]
fn test_stream_deserializer_ends_without_error() {
// A stream with only whitespace left is finished: `next()` returns None, as for
// serde_json's StreamDeserializer. It used to yield an extra `Err(EOF while parsing)`.
fn collect(json: &str) -> Vec<std::result::Result<Value, ()>> {
Deserializer::from_str(json)
.into_stream::<Value>()
.map(|r| r.map_err(|_| ()))
.collect()
}
assert!(collect("").is_empty());
assert!(collect(" \n\t").is_empty());
assert_eq!(
collect("1 2"),
vec![Ok(crate::json!(1)), Ok(crate::json!(2))]
);
assert_eq!(
collect("[1] {} \n"),
vec![Ok(crate::json!([1])), Ok(crate::json!({}))]
);
assert_eq!(collect("true"), vec![Ok(crate::json!(true))]);
// garbage or a truncated value is still an error, and ends the stream
assert_eq!(collect("1 x"), vec![Ok(crate::json!(1)), Err(())]);
assert_eq!(collect("[1] [2"), vec![Ok(crate::json!([1])), Err(())]);
}

#[test]
fn test_utf8_lossy() {
let data = [&[b'\"', 0xff, b'\"'][..], br#""\uD800""#, br#""\udc00""#];
Expand Down
Loading