mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-11-03 16:42:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Fix stack overflow in parse_subexpr (#1410)

Browse source
This commit is contained in:
Emil Ejbyfeldt 2024-09-06 16:17:20 +02:00 • committed by GitHub
parent aa714e3447
commit 4875dadbf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/parser/mod.rs
View file

@ -897,12 +897,12 @@ impl<'a> Parser<'a> {
/// Parse a new expression. /// Parse a new expression.
pub fn parse_expr(&mut self) -> Result<Expr, ParserError> { pub fn parse_expr(&mut self) -> Result<Expr, ParserError> {
let _guard = self.recursion_counter.try_decrease()?;
self.parse_subexpr(self.dialect.prec_unknown()) self.parse_subexpr(self.dialect.prec_unknown())
} }
/// Parse tokens until the precedence changes. /// Parse tokens until the precedence changes.
pub fn parse_subexpr(&mut self, precedence: u8) -> Result<Expr, ParserError> { pub fn parse_subexpr(&mut self, precedence: u8) -> Result<Expr, ParserError> {
let _guard = self.recursion_counter.try_decrease()?;
debug!("parsing expr"); debug!("parsing expr");
let mut expr = self.parse_prefix()?; let mut expr = self.parse_prefix()?;
debug!("prefix: {:?}", expr); debug!("prefix: {:?}", expr);

7
tests/sqlparser_common.rs
View file

@ -8980,6 +8980,13 @@ fn parse_deeply_nested_parens_hits_recursion_limits() {
assert_eq!(ParserError::RecursionLimitExceeded, res.unwrap_err()); assert_eq!(ParserError::RecursionLimitExceeded, res.unwrap_err());
} }
#[test]
fn parse_deeply_nested_unary_op_hits_recursion_limits() {
let sql = format!("SELECT {}", "+".repeat(1000));
let res = parse_sql_statements(&sql);
assert_eq!(ParserError::RecursionLimitExceeded, res.unwrap_err());
}
#[test] #[test]
fn parse_deeply_nested_expr_hits_recursion_limits() { fn parse_deeply_nested_expr_hits_recursion_limits() {
let dialect = GenericDialect {}; let dialect = GenericDialect {};