Skip to content
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

fix: stack overflow with deep nested braces #10240

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: stack overflow with deep nested braces #10240

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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/swc_ecma_parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ phf = { workspace = true, features = ["macros"] }
swc_atoms = { version = "5.0.0", path = "../swc_atoms" }
swc_common = { version = "8.0.0", path = "../swc_common" }
swc_ecma_ast = { version = "8.0.1", path = "../swc_ecma_ast" }
swc_ecma_utils = { version = "11.0.0", path = "../swc_ecma_utils" }
swc_ecma_visit = { version = "8.0.0", path = "../swc_ecma_visit", optional = true }

[target.'cfg(not(any(target_arch = "wasm32", target_arch = "arm")))'.dependencies]
Expand Down
28 changes: 18 additions & 10 deletions crates/swc_ecma_parser/src/parser/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use either::Either;
use rustc_hash::FxHashMap;
use swc_common::{ast_node, util::take::Take, Spanned};
use swc_ecma_utils::stack_size::maybe_grow_default;

use super::{pat::PatType, util::ExprExt, *};
use crate::{lexer::TokenContext, parser::class_and_fn::IsSimpleParameterList};
Expand Down Expand Up @@ -69,7 +70,7 @@ impl<I: Tokens> Parser<I> {
}
}

self.parse_assignment_expr_base()
maybe_grow_default(|| self.parse_assignment_expr_base())
}

/// Parse an assignment expression. This includes applications of
Expand Down Expand Up @@ -215,7 +216,7 @@ impl<I: Tokens> Parser<I> {

let start = cur_pos!(self);

let test = self.parse_bin_expr()?;
let test = maybe_grow_default(|| self.parse_bin_expr())?;
return_if_arrow!(self, test);

if eat!(self, '?') {
Expand Down Expand Up @@ -380,7 +381,9 @@ impl<I: Tokens> Parser<I> {
}

tok!('(') => {
return self.parse_paren_expr_or_arrow_fn(can_be_arrow, None);
return maybe_grow_default(|| {
maybe_grow_default(|| self.parse_paren_expr_or_arrow_fn(can_be_arrow, None))
});
}

_ => {}
Expand Down Expand Up @@ -540,8 +543,11 @@ impl<I: Tokens> Parser<I> {
should_not_lex_lt_or_gt_as_type: true,
..self.ctx()
};
self.with_ctx(ctx)
.parse_member_expr_or_new_expr_inner(is_new_expr)

maybe_grow_default(|| {
self.with_ctx(ctx)
.parse_member_expr_or_new_expr_inner(is_new_expr)
})
}

fn parse_member_expr_or_new_expr_inner(&mut self, is_new_expr: bool) -> PResult<Box<Expr>> {
Expand Down Expand Up @@ -658,7 +664,7 @@ impl<I: Tokens> Parser<I> {
return self.parse_subscripts(base, true, false);
}
if eat!(self, "import") {
return self.parse_dynamic_import_or_import_meta(start, true);
return maybe_grow_default(|| self.parse_dynamic_import_or_import_meta(start, true));
}
let obj = self.parse_primary_expr()?;
return_if_arrow!(self, obj);
Expand Down Expand Up @@ -689,7 +695,7 @@ impl<I: Tokens> Parser<I> {
pub(super) fn parse_new_expr(&mut self) -> PResult<Box<Expr>> {
trace_cur!(self, parse_new_expr);

self.parse_member_expr_or_new_expr(true)
maybe_grow_default(|| self.parse_member_expr_or_new_expr(true))
}

/// Parse `Arguments[Yield, Await]`
Expand Down Expand Up @@ -760,8 +766,10 @@ impl<I: Tokens> Parser<I> {
})
.map(|expr| ExprOrSpread { spread, expr })
} else {
self.parse_assignment_expr()
.map(|expr| ExprOrSpread { spread: None, expr })
maybe_grow_default(|| {
self.parse_assignment_expr()
.map(|expr| ExprOrSpread { spread: None, expr })
})
}
}

Expand Down Expand Up @@ -1776,7 +1784,7 @@ impl<I: Tokens> Parser<I> {

ExprOrSpread { spread, expr }
} else {
self.include_in_expr(true).parse_expr_or_spread()?
maybe_grow_default(|| self.include_in_expr(true).parse_expr_or_spread())?
}
};

Expand Down
4 changes: 2 additions & 2 deletions crates/swc_ecma_parser/src/parser/expr/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ impl<I: Tokens> Parser<I> {

let ctx = self.ctx();

let left = match self.parse_unary_expr() {
let left = match maybe_grow_default(|| self.parse_unary_expr()) {
Ok(v) => v,
Err(err) => {
trace_cur!(self, parse_bin_expr__recovery_unary_err);
Expand Down Expand Up @@ -341,7 +341,7 @@ impl<I: Tokens> Parser<I> {
}

// UpdateExpression
let expr = self.parse_lhs_expr()?;
let expr = maybe_grow_default(|| self.parse_lhs_expr())?;
return_if_arrow!(self, expr);

// Line terminator isn't allowed here.
Expand Down
4 changes: 4 additions & 0 deletions crates/swc_fast_ts_strip/tests/fixture/issue-10207.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions crates/swc_fast_ts_strip/tests/fixture/issue-10207.transform.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions crates/swc_fast_ts_strip/tests/fixture/issue-10207.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
var data = "";
if (!(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((data === "AED") || (data === "AFN")) || (data === "ALL")) || (data === "AMD")) || (data === "ANG")) || (data === "AOA")) || (data === "ARS")) || (data === "AUD")) || (data === "AWG")) || (data === "AZN")) || (data === "BAM")) || (data === "BBD")) || (data === "BDT")) || (data === "BGN")) || (data === "BHD")) || (data === "BIF")) || (data === "BMD")) || (data === "BND")) || (data === "BOB")) || (data === "BOV")) || (data === "BRL")) || (data === "BSD")) || (data === "BTN")) || (data === "BWP")) || (data === "BYN")) || (data === "BZD")) || (data === "CAD")) || (data === "CDF")) || (data === "CHE")) || (data === "CHF")) || (data === "CHW")) || (data === "CLF")) || (data === "CLP")) || (data === "CNY")) || (data === "COP")) || (data === "COU")) || (data === "CRC")) || (data === "CUC")) || (data === "CUP")) || (data === "CVE")) || (data === "CZK")) || (data === "DJF")) || (data === "DKK")) || (data === "DOP")) || (data === "DZD")) || (data === "EGP")) || (data === "ERN")) || (data === "ETB")) || (data === "EUR")) || (data === "FJD")) || (data === "FKP")) || (data === "GBP")) || (data === "GEL")) || (data === "GHS")) || (data === "GIP")) || (data === "GMD")) || (data === "GNF")) || (data === "GTQ")) || (data === "GYD")) || (data === "HKD")) || (data === "HNL")) || (data === "HRK")) || (data === "HTG")) || (data === "HUF")) || (data === "IDR")) || (data === "ILS")) || (data === "INR")) || (data === "IQD")) || (data === "IRR")) || (data === "ISK")) || (data === "JMD")) || (data === "JOD")) || (data === "JPY")) || (data === "KES")) || (data === "KGS")) || (data === "KHR")) || (data === "KMF")) || (data === "KPW")) || (data === "KRW")) || (data === "KWD")) || (data === "KYD")) || (data === "KZT")) || (data === "LAK")) || (data === "LBP")) || (data === "LKR")) || (data === "LRD")) || (data === "LSL")) || (data === "LYD")) || (data === "MAD")) || (data === "MDL")) || (data === "MGA")) || (data === "MKD")) || (data === "MMK")) || (data === "MNT")) || (data === "MOP")) || (data === "MRU")) || (data === "MUR")) || (data === "MVR")) || (data === "MWK")) || (data === "MXN")) || (data === "MXV")) || (data === "MYR")) || (data === "MZN")) || (data === "NAD")) || (data === "NGN")) || (data === "NIO")) || (data === "NOK")) || (data === "NPR")) || (data === "NZD")) || (data === "OMR")) || (data === "PAB")) || (data === "PEN")) || (data === "PGK")) || (data === "PHP")) || (data === "PKR")) || (data === "PLN")) || (data === "PYG")) || (data === "QAR")) || (data === "RON")) || (data === "RSD")) || (data === "RUB")) || (data === "RWF")) || (data === "SAR")) || (data === "SBD")) || (data === "SCR")) || (data === "SDG")) || (data === "SEK")) || (data === "SGD")) || (data === "SHP")) || (data === "SLL")) || (data === "SOS")) || (data === "SRD")) || (data === "SSP")) || (data === "STN")) || (data === "SVC")) || (data === "SYP")) || (data === "SZL")) || (data === "THB")) || (data === "TJS")) || (data === "TMT")) || (data === "TND")) || (data === "TOP")) || (data === "TRY")) || (data === "TTD")) || (data === "TWD")) || (data === "TZS")) || (data === "UAH")) || (data === "UGX")) || (data === "USD")) || (data === "USN")) || (data === "UYI")) || (data === "UYU")) || (data === "UYW")) || (data === "UZS")) || (data === "VES")) || (data === "VND")) || (data === "VUV")) || (data === "WST")) || (data === "XAF")) || (data === "XAG")) || (data === "XAU")) || (data === "XBA")) || (data === "XBB")) || (data === "XBC")) || (data === "XBD")) || (data === "XCD")) || (data === "XDR")) || (data === "XOF")) || (data === "XPD")) || (data === "XPF")) || (data === "XPT")) || (data === "XSU")) || (data === "XTS")) || (data === "XUA")) || (data === "XXX")) || (data === "YER")) || (data === "ZAR")) || (data === "ZMW")) || (data === "ZWL"))) {
console.log("Hello");
}
Loading