Don't trim whitespace from XML plist strings

ebarnard · Feb 17, 2023 · b1cd6ad · b1cd6ad
1 parent aa38213
commit b1cd6ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/src/serde_tests.rs b/src/serde_tests.rs
@@ -623,7 +623,7 @@ fn check_common_plist(dict: &Dictionary) {
     assert_eq!(lines.len(), 2);
     assert_eq!(
         lines[0].as_string().unwrap(),
-        "It is a tale told by an idiot,"
+        "It is a tale told by an idiot,     "
     );
     assert_eq!(
         lines[1].as_string().unwrap(),

diff --git a/src/stream/binary_reader.rs b/src/stream/binary_reader.rs
@@ -442,7 +442,7 @@ mod tests {
             Real(1.6),
             String("Lines".into()),
             StartArray(Some(2)),
-            String("It is a tale told by an idiot,".into()),
+            String("It is a tale told by an idiot,     ".into()),
             String("Full of sound and fury, signifying nothing.".into()),
             EndCollection,
             String("Death".into()),

diff --git a/src/stream/xml_reader.rs b/src/stream/xml_reader.rs
@@ -34,7 +34,7 @@ struct ReaderState<R: Read>(EventReader<BufReader<R>>);
 impl<R: Read> XmlReader<R> {
     pub fn new(reader: R) -> XmlReader<R> {
         let mut xml_reader = EventReader::from_reader(BufReader::new(reader));
-        xml_reader.trim_text(true);
+        xml_reader.trim_text(false);
         xml_reader.check_end_names(true);
         xml_reader.expand_empty_elements(true);
 
@@ -179,8 +179,16 @@ impl<R: Read> ReaderState<R> {
                     _ => (),
                 },
                 XmlEvent::Eof => return Ok(None),
-                XmlEvent::Text(_) => {
-                    return Err(self.with_pos(ErrorKind::UnexpectedXmlCharactersExpectedElement))
+                XmlEvent::Text(text) => {
+                    let unescaped = text
+                        .unescape()
+                        .map_err(|err| self.with_pos(ErrorKind::from(err)))?;
+
+                    if !unescaped.chars().all(char::is_whitespace) {
+                        return Err(
+                            self.with_pos(ErrorKind::UnexpectedXmlCharactersExpectedElement)
+                        );
+                    }
                 }
                 XmlEvent::PI(_)
                 | XmlEvent::Decl(_)
@@ -214,7 +222,7 @@ mod tests {
             String("William Shakespeare".into()),
             String("Lines".into()),
             StartArray(None),
-            String("It is a tale told by an idiot,".into()),
+            String("It is a tale told by an idiot,     ".into()),
             String("Full of sound and fury, signifying nothing.".into()),
             EndCollection,
             String("Death".into()),

diff --git a/tests/data/binary.plist b/tests/data/binary.plist
diff --git a/tests/data/xml.plist b/tests/data/xml.plist
@@ -6,7 +6,7 @@
 	<string>William Shakespeare</string>
 	<key>Lines</key>
 	<array>
-		<string>It is a tale told by an idiot,</string>
+		<string>It is a tale told by an idiot,     </string>
 		<string>Full of sound and fury, signifying nothing.</string>
 	</array>
 	<key>Death</key>