check that brackets are properly balanced in a type definition

artpaul · Sep 28, 2020 · c027802 · c027802
1 parent ddeb031
commit c027802
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/clickhouse/types/type_parser.cpp b/clickhouse/types/type_parser.cpp
@@ -112,6 +112,10 @@ bool TypeParser::Parse(TypeAst* type) {
                 type_ = &type_->elements.back();
                 break;
             case Token::EOS:
+                // Ubalanced braces, brackets, etc is an error.
+                if (open_elements_.size() != 1) {
+                    return false;
+                }
                 return true;
             case Token::Invalid:
                 return false;

diff --git a/ut/columns_ut.cpp b/ut/columns_ut.cpp
@@ -1,6 +1,7 @@
 #include <clickhouse/columns/array.h>
 #include <clickhouse/columns/date.h>
 #include <clickhouse/columns/enum.h>
+#include <clickhouse/columns/factory.h>
 #include <clickhouse/columns/nullable.h>
 #include <clickhouse/columns/numeric.h>
 #include <clickhouse/columns/string.h>
@@ -169,3 +170,11 @@ TEST(ColumnsCase, UUIDSlice) {
     ASSERT_EQ(sub->At(0), UInt128(0x84b9f24bc26b49c6llu, 0xa03b4ab723341951llu));
     ASSERT_EQ(sub->At(1), UInt128(0x3507213c178649f9llu, 0x9faf035d662f60aellu));
 }
+
+TEST(ColumnsCase, UnmatchedBrackets) {
+    ASSERT_NE(nullptr, CreateColumnByType("FixedString(10)"));
+    // When type string has unmatched brackets, CreateColumnByType must return nullptr.
+    ASSERT_EQ(nullptr, CreateColumnByType("FixedString(10"));
+    ASSERT_EQ(nullptr, CreateColumnByType("Nullable(FixedString(10000"));
+    ASSERT_EQ(nullptr, CreateColumnByType("Nullable(FixedString(10000)"));
+}