Skip to content

Resolve "xs:list deserialization does not split on all whitespace" #843

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.

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

### Bug Fixes

- [#843]: `xs:list` deserialization now delimits on whitespaces ` `, `\r`, `\t`, and `\n`.

[#843]: https://github.com/tafia/quick-xml/pull/843

### Misc Changes


Expand Down
29 changes: 25 additions & 4 deletions src/de/simple_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use crate::encoding::Decoder;
use crate::errors::serialize::DeError;
use crate::escape::unescape;
use crate::utils::CowRef;
use memchr::memchr;
use serde::de::value::UnitDeserializer;
use serde::de::{
DeserializeSeed, Deserializer, EnumAccess, IntoDeserializer, SeqAccess, VariantAccess, Visitor,
Expand Down Expand Up @@ -361,14 +360,19 @@ impl<'de, 'a> SeqAccess<'de> for ListIter<'de, 'a> {
T: DeserializeSeed<'de>,
{
if let Some(mut content) = self.content.take() {
const DELIMITER: u8 = b' ';
// NOTE: when normalization will be implemented, it may be enough
// to check only b' ', because all whitespaces will be normalized
const DELIMETERS: &str = " \t\r\n";

loop {
let string = content.as_str();
if string.is_empty() {
return Ok(None);
}
return match memchr(DELIMITER, string.as_bytes()) {

let first_delimiter = string.find(|c| DELIMETERS.contains(c));

return match first_delimiter {
// No delimiters in the `content`, deserialize it as a whole atomic
None => match content {
Content::Input(s) => seed.deserialize(AtomicDeserializer {
Expand All @@ -391,7 +395,7 @@ impl<'de, 'a> SeqAccess<'de> for ListIter<'de, 'a> {
// `content` started with a space, skip them all
Some(0) => {
// Skip all spaces
let start = string.as_bytes().iter().position(|ch| *ch != DELIMITER);
let start = string.find(|c| !DELIMETERS.contains(c));
content = match (start, content) {
// We cannot find any non-space character, so string contains only spaces
(None, _) => return Ok(None),
Expand Down Expand Up @@ -1168,6 +1172,23 @@ mod tests {
assert_eq!(seq.next_element::<()>().unwrap(), None);
assert_eq!(seq.next_element::<()>().unwrap(), None);
}

#[test]
fn mixed_whitespace_delimiters() {
let mut seq = ListIter {
content: Some(Content::Input("one two\nthree\rfour\tfive six")),
escaped: true,
};

assert_eq!(seq.next_element::<&str>().unwrap(), Some("one"));
assert_eq!(seq.next_element::<&str>().unwrap(), Some("two"));
assert_eq!(seq.next_element::<&str>().unwrap(), Some("three"));
assert_eq!(seq.next_element::<&str>().unwrap(), Some("four"));
assert_eq!(seq.next_element::<&str>().unwrap(), Some("five"));
assert_eq!(seq.next_element::<&str>().unwrap(), Some("six"));
assert_eq!(seq.next_element::<&str>().unwrap(), None);
assert_eq!(seq.next_element::<&str>().unwrap(), None);
}
}

mod utf8 {
Expand Down