Skip to content

Fix a stack overflow parsing instance/module types #334

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

Merged
fitzgen merged 1 commit into from
Sep 14, 2021
Merged

Fix a stack overflow parsing instance/module types #334

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
10 changes: 10 additions & 0 deletions crates/wast/src/ast/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,11 @@ pub struct ModuleType<'a> {

impl<'a> Parse<'a> for ModuleType<'a> {
fn parse(parser: Parser<'a>) -> Result<Self> {
// See comments in `nested_module.rs` for why this is tested here.
if parser.parens_depth() > 100 {
return Err(parser.error("module type nesting too deep"));
}

let mut imports = Vec::new();
while parser.peek2::<kw::import>() {
imports.push(parser.parens(|p| p.parse())?);
Expand Down Expand Up @@ -658,6 +663,11 @@ pub struct InstanceType<'a> {

impl<'a> Parse<'a> for InstanceType<'a> {
fn parse(parser: Parser<'a>) -> Result<Self> {
// See comments in `nested_module.rs` for why this is tested here.
if parser.parens_depth() > 100 {
return Err(parser.error("instance type nesting too deep"));
}

let mut exports = Vec::new();
while !parser.is_empty() {
exports.push(parser.parens(|p| p.parse())?);
Expand Down
106 changes: 106 additions & 0 deletions tests/local/deep.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
(assert_malformed (module quote

"(import\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
"(export\"\"(instance (export\"\"(instance (export\"\"(instance (export\"\"(instance"
)
"nesting too deep")