Fix DOCTYPE closing tag recognition in bufread

tafia · Sep 19, 2024 · 9fafd50 · 9fafd50
1 parent 2f3824a
commit 9fafd50
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/reader/mod.rs b/src/reader/mod.rs
@@ -1088,10 +1088,13 @@ impl BangType {
             Self::DocType => {
                 for i in memchr::memchr_iter(b'>', chunk) {
                     let content = &chunk[..i];
-                    let balance = memchr::memchr2_iter(b'<', b'>', content)
+                    let balance_buf = memchr::memchr2_iter(b'<', b'>', buf)
+                        .map(|p| if buf[p] == b'<' { 1i32 } else { -1 })
+                        .sum::<i32>();
+                    let balance_content = memchr::memchr2_iter(b'<', b'>', content)
                         .map(|p| if content[p] == b'<' { 1i32 } else { -1 })
                         .sum::<i32>();
-                    if balance == 0 {
+                    if balance_buf + balance_content == 0 {
                         return Some((content, i + 1)); // +1 for `>`
                     }
                 }

diff --git a/tests/issues.rs b/tests/issues.rs
@@ -477,3 +477,19 @@ fn issue776() {
         Event::End(BytesEnd::new(r#"tag attr=">""#))
     );
 }
+
+/// Regression test for https://github.com/tafia/quick-xml/issues/801
+#[test]
+fn issue801() {
+    let xml = BufReader::with_capacity(4, b"<!DOCTYPE X [<!-- --><!ENTITY a \"a\">]>" as &[u8]);
+    let mut reader = Reader::from_reader(xml);
+    let mut buf = Vec::new();
+    loop {
+        buf.clear();
+        match reader.read_event_into(&mut buf) {
+            Err(e) => panic!("Error at position {}: {:?}", reader.error_position(), e),
+            Ok(Event::Eof) => {break}
+            Ok(_) => {}
+        }
+    }
+}