Skip to content

Check recursion depth in OptimizedRegularExpression #52451

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
hanfei1991 merged 2 commits into from
Jul 22, 2023
Merged

Check recursion depth in OptimizedRegularExpression #52451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cda42e6
Add a test
alexey-milovidov Jul 22, 2023
21ffce0
Check regular expression depth
alexey-milovidov Jul 22, 2023
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
3 changes: 3 additions & 0 deletions src/Common/OptimizedRegularExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <limits>
#include <Common/Exception.h>
#include <Common/PODArray.h>
#include <Common/checkStackSize.h>
#include <Common/OptimizedRegularExpression.h>

#define MIN_LENGTH_FOR_STRSTR 3
Expand Down Expand Up @@ -50,6 +51,8 @@ const char * analyzeImpl(
bool & is_trivial,
Literals & global_alternatives)
{
checkStackSize();

/** The expression is trivial if all the metacharacters in it are escaped.
* The non-alternative string is
* a string outside parentheses,
Expand Down
Empty file added tests/queries/0_stateless/02831_regexp_analyze_recursion.reference
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions tests/queries/0_stateless/02831_regexp_analyze_recursion.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT match('', repeat('(', 100000)); -- { serverError 306 }