Merge pull request ClickHouse#11318 from devwout/master

alexey-milovidov · web-flow · commit 5b2b3739b9ae · 2020-05-31T17:52:00.000+03:00
Fix visitParamExtractRaw for strings with unbalanced { or [.
diff --git a/src/Functions/visitParamExtractRaw.cpp b/src/Functions/visitParamExtractRaw.cpp
@@ -22,6 +22,14 @@ struct ExtractRaw
                 expects_end.pop_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
             {
                 switch (*pos)
@@ -38,11 +46,6 @@ struct ExtractRaw
                         current_expect_end = '"';
                         expects_end.push_back(current_expect_end);
                         break;
-                    case '\\':
-                        /// skip backslash
-                        if (pos + 1 < end && pos[1] == '"')
-                            pos++;
-                        break;
                     default:
                         if (!current_expect_end && (*pos == ',' || *pos == '}'))
                         {
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.reference b/tests/queries/0_stateless/00539_functions_for_working_with_json.reference
@@ -9,5 +9,7 @@ test"string
  "test_string"
  "test\\"string"
  "test\\"string"
+ "{"
+ "["
  ["]", "2", "3"]
  {"nested" : [1,2,3]}
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
@@ -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", "other":123}', 'myparam');
+SELECT visitParamExtractRaw('{"myparam": "{"}', 'myparam');
+SELECT visitParamExtractRaw('{"myparam": "["}', 'myparam');
 SELECT visitParamExtractRaw('{"myparam": ["]", "2", "3"], "other":123}', 'myparam');
 SELECT visitParamExtractRaw('{"myparam": {"nested" : [1,2,3]}, "other":123}', 'myparam');
