Skip to content

Change parser state only after .await points to prevent state corruption #935

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.

Sign up for GitHub

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

Draft
Mingun wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Change parser state only after .await points to prevent state corruption #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@

### Bug Fixes

- [#624]: Fix corruption of parser state after cancelling of async reading.

### Misc Changes

[#624]: https://github.com/tafia/quick-xml/issues/624


## 0.39.0 -- 2026-01-11

Expand Down
11 changes: 8 additions & 3 deletions src/reader/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,15 @@ macro_rules! read_until_close {
$reader:expr
$(, $await:ident)?
) => {{
$self.state.state = ParseState::InsideText;

let start = $self.state.offset;
match $reader.peek_one() $(.$await)? {
// It is important to change state only after .await point, because future
// may be cancelled only at .await points
//
// See https://github.com/tafia/quick-xml/issues/624
let lookahead = $reader.peek_one() $(.$await)?;

$self.state.state = ParseState::InsideText;
match lookahead {
// `<!` - comment, CDATA or DOCTYPE declaration
Ok(Some(b'!')) => match $reader
.read_bang_element($buf, &mut $self.state.offset)
Expand Down