Merge pull request #32 from farodin91/fixes-issue-3

Prevent infinite loop at the end of the document

Author: oli-obk

src/de/mod.rs

@@ -104,10 +104,8 @@ impl<'de, R: Read> Deserializer<R> {
         loop {
             match self.reader.next().map_err(ErrorKind::Syntax)? {
                 XmlEvent::StartDocument { .. } |
-                XmlEvent::EndDocument { .. } |
                 XmlEvent::ProcessingInstruction { .. } |
                 XmlEvent::Comment(_) => { /* skip */ },
-
                 other => return Ok(other),
             }
         }

src/de/seq.rs

@@ -44,7 +44,9 @@ impl<'de, 'a, R: 'a + Read> de::SeqAccess<'de> for SeqAccess<'a, R> {
             (&XmlEvent::StartElement { ref name, .. }, Some(expected_name)) => {
                 &name.local_name == expected_name
             },
-            (&XmlEvent::EndElement { .. }, None) | (_, Some(_)) => false,
+            (&XmlEvent::EndElement { .. }, None) |
+            (_, Some(_)) |
+            (&XmlEvent::EndDocument { .. }, _) => false,
             (_, None) => true,
         };
         if more {

tests/migrated.rs

@@ -256,8 +256,6 @@ fn test_parse_enum() {
     use self::Animal::*;
     init_logger();
 
-    init_logger();
-
     test_parse_ok(&[
         ("<Animal xsi:type=\"Dog\"/>", Dog),
         (

tests/test.rs

@@ -27,6 +27,30 @@ fn simple_struct_from_attributes() {
     );
 }
 
+#[test]
+fn multiple_roots_attributes() {
+    let s = r##"
+        <item name="hello" source="world.rs" />
+        <item name="hello" source="world.rs" />
+    "##;
+
+    let item: Vec<Item> = from_str(s).unwrap();
+
+    assert_eq!(
+        item,
+        vec![
+            Item {
+                name: "hello".to_string(),
+                source: "world.rs".to_string(),
+            },
+            Item {
+                name: "hello".to_string(),
+                source: "world.rs".to_string(),
+            },
+        ]
+    );
+}
+
 #[test]
 fn simple_struct_from_attribute_and_child() {
     let s = r##"