Skip to content

v0: add missing matching pop_depth for push_depth in skip_*. #51

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

Merged
merged 1 commit into from
Jul 20, 2021
Merged
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
31 changes: 29 additions & 2 deletions src/v0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -485,12 +485,12 @@ impl<'s> Parser<'s> {
}
_ => return Err(Invalid),
}

self.pop_depth();
Ok(())
}

fn skip_generic_arg(&mut self) -> Result<(), Invalid> {
self.push_depth()?;

if self.eat(b'L') {
self.integer_62()?;
Ok(())
Expand Down Expand Up @@ -563,6 +563,8 @@ impl<'s> Parser<'s> {
self.skip_path()?;
}
}

self.pop_depth();
Ok(())
}

Expand Down Expand Up @@ -599,6 +601,8 @@ impl<'s> Parser<'s> {
}

self.hex_nibbles()?;

self.pop_depth();
Ok(())
}
}
Expand Down Expand Up @@ -1791,6 +1795,29 @@ RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRB_E"
)
);
}

#[test]
fn recursion_limit_leaks() {
// NOTE(eddyb) this test checks that both paths and types support the
// recursion limit correctly, i.e. matching `push_depth` and `pop_depth`,
// and don't leak "recursion levels" and trip the limit.
// The test inputs are generated on the fly, using a repeated pattern,
// as hardcoding the actual strings would be too verbose.
// Also, `MAX_DEPTH` can be directly used, instead of assuming its value.
for &(sym_leaf, expected_leaf) in &[("p", "_"), ("Rp", "&_"), ("C1x", "x")] {
let mut sym = format!("_RIC0p");
let mut expected = format!("::<_");
for _ in 0..(super::MAX_DEPTH * 2) {
sym.push_str(sym_leaf);
expected.push_str(", ");
expected.push_str(expected_leaf);
}
sym.push('E');
expected.push('>');

t_nohash!(&sym, expected);
}
}
}

struct LimitedFormatter<'a, 'b> {
Expand Down