thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix visitParamExtractRaw for strings with unbalanced { or [.

Browse Source 
Closes #11254 .
This commit is contained in:
Ewout 2020-05-30 21:44:22 +02:00
parent a4b2daae0d
commit 70eaae38f2
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Functions/visitParamExtractRaw.cpp
View File

@ -22,6 +22,14 @@ struct ExtractRaw
expects_end.pop_back(); expects_end.pop_back();
current_expect_end = expects_end.empty() ? 0 : expects_end.back(); current_expect_end = expects_end.empty() ? 0 : expects_end.back();
} }
else if (current_expect_end == '"')
{
/// skip backslash
if (*pos == '\\' && pos + 1 < end && pos[1] == '"')
{
pos++;
}
}
else else
{ {
switch (*pos) switch (*pos)
@ -38,11 +46,6 @@ struct ExtractRaw
current_expect_end = '"'; current_expect_end = '"';
expects_end.push_back(current_expect_end); expects_end.push_back(current_expect_end);
break; break;
case '\\':
/// skip backslash
if (pos + 1 < end && pos[1] == '"')
pos++;
break;
default: default:
if (!current_expect_end && (*pos == ',' || *pos == '}')) if (!current_expect_end && (*pos == ',' || *pos == '}'))
{ {

2
tests/queries/0_stateless/00539_functions_for_working_with_json.reference
View File

@ -9,5 +9,7 @@ test"string
"test_string" "test_string"
"test\\"string" "test\\"string"
"test\\"string" "test\\"string"
"{"
"["
["]", "2", "3"] ["]", "2", "3"]
{"nested" : [1,2,3]} {"nested" : [1,2,3]}

2
tests/queries/0_stateless/00539_functions_for_working_with_json.sql
View File

@ -11,5 +11,7 @@ SELECT visitParamExtractRaw('{"myparam":"test_string"}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": "test_string"}', 'myparam'); SELECT visitParamExtractRaw('{"myparam": "test_string"}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": "test\\"string"}', 'myparam'); SELECT visitParamExtractRaw('{"myparam": "test\\"string"}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": "test\\"string", "other":123}', 'myparam'); SELECT visitParamExtractRaw('{"myparam": "test\\"string", "other":123}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": "{"}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": "["}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": ["]", "2", "3"], "other":123}', 'myparam'); SELECT visitParamExtractRaw('{"myparam": ["]", "2", "3"], "other":123}', 'myparam');
SELECT visitParamExtractRaw('{"myparam": {"nested" : [1,2,3]}, "other":123}', 'myparam'); SELECT visitParamExtractRaw('{"myparam": {"nested" : [1,2,3]}, "other":123}', 'myparam');