thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-03 13:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added range check for extractGroups function

Browse Source
This commit is contained in:
Alexey Milovidov 2020-05-08 02:31:15 +03:00
parent 2cb4c91c02
commit 1f0d95e5c3
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Functions/extractAllGroups.cpp
View File

@ -18,6 +18,7 @@ namespace DB
namespace ErrorCodes
{
extern const int ARGUMENT_OUT_OF_BOUND;
extern const int BAD_ARGUMENTS;
}
@ -64,8 +65,15 @@ public:
const auto regexp = Regexps::get<false, false>(needle);
const auto & re2 = regexp->getRE2();
if (!re2)
throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
const size_t groups_count = re2->NumberOfCapturingGroups();
if (!groups_count)
throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
// Including 0-group, which is the whole regexp.
PODArrayWithStackMemory<re2_st::StringPiece, 128> matched_groups(groups_count + 1);

8
src/Functions/extractGroups.cpp
View File

@ -18,6 +18,7 @@ namespace DB
namespace ErrorCodes
{
extern const int ARGUMENT_OUT_OF_BOUND;
extern const int BAD_ARGUMENTS;
}
@ -64,8 +65,15 @@ public:
const auto regexp = Regexps::get<false, false>(needle);
const auto & re2 = regexp->getRE2();
if (!re2)
throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
const size_t groups_count = re2->NumberOfCapturingGroups();
if (!groups_count)
throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
// Including 0-group, which is the whole regexp.
PODArrayWithStackMemory<re2_st::StringPiece, 128> matched_groups(groups_count + 1);

0
tests/queries/0_stateless/01275_extract_groups_check.reference Normal file
View File

14
tests/queries/0_stateless/01275_extract_groups_check.sql Normal file
View File

@ -0,0 +1,14 @@
SELECT extractGroups('hello', ''); -- { serverError 69 }
SELECT extractAllGroups('hello', ''); -- { serverError 69 }
SELECT extractGroups('hello', ' '); -- { serverError 36 }
SELECT extractAllGroups('hello', ' '); -- { serverError 36 }
SELECT extractGroups('hello', '\0'); -- { serverError 36 }
SELECT extractAllGroups('hello', '\0'); -- { serverError 36 }
SELECT extractGroups('hello', 'world'); -- { serverError 36 }
SELECT extractAllGroups('hello', 'world'); -- { serverError 36 }
SELECT extractGroups('hello', 'hello|world'); -- { serverError 36 }
SELECT extractAllGroups('hello', 'hello|world'); -- { serverError 36 }