Fix undefined array key in WithStatement

Check if CTE column brackets was closed.

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

Author: MauricioFauth

src/Components/ArrayObj.php

@@ -92,6 +92,10 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
             // End of statement.
             if ($token->type === Token::TYPE_DELIMITER) {
+                if ($brackets > 0) {
+                    $parser->error('A closing bracket was expected.', $token);
+                }
+
                 break;
             }
 

src/Statements/WithStatement.php

@@ -125,7 +125,12 @@ public function parse(Parser $parser, TokensList $list)
                 $state = 1;
             } elseif ($state === 1) {
                 if ($token->type === Token::TYPE_OPERATOR && $token->value === '(') {
-                    $this->withers[$wither]->columns = Array2d::parse($parser, $list);
+                    $columns = Array2d::parse($parser, $list);
+                    if ($parser->errors !== []) {
+                        break;
+                    }
+
+                    $this->withers[$wither]->columns = $columns;
                     $state = 2;
                 } elseif ($token->type === Token::TYPE_KEYWORD && $token->keyword === 'AS') {
                     $state = 3;

tests/Misc/BugsTest.php

@@ -24,6 +24,7 @@ public function bugProvider(): array
         return [
             ['bugs/fuzz1'],
             ['bugs/fuzz2'],
+            ['bugs/fuzz3'],
             ['bugs/gh9'],
             ['bugs/gh14'],
             ['bugs/gh16'],

tests/data/bugs/fuzz3.in

@@ -0,0 +1 @@
+WITH*/A(

tests/data/bugs/fuzz3.out

@@ -0,0 +1,113 @@
+{
+    "query": "WITH*/A(",
+    "lexer": {
+        "@type": "PhpMyAdmin\\SqlParser\\Lexer",
+        "str": "WITH*/A(",
+        "len": 8,
+        "last": 8,
+        "list": {
+            "@type": "PhpMyAdmin\\SqlParser\\TokensList",
+            "tokens": [
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "WITH",
+                    "value": "WITH",
+                    "keyword": "WITH",
+                    "type": 1,
+                    "flags": 3,
+                    "position": 0
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "*/",
+                    "value": "*/",
+                    "keyword": null,
+                    "type": 4,
+                    "flags": 2,
+                    "position": 4
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "A",
+                    "value": "A",
+                    "keyword": null,
+                    "type": 0,
+                    "flags": 0,
+                    "position": 6
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": "(",
+                    "value": "(",
+                    "keyword": null,
+                    "type": 2,
+                    "flags": 16,
+                    "position": 7
+                },
+                {
+                    "@type": "PhpMyAdmin\\SqlParser\\Token",
+                    "token": null,
+                    "value": null,
+                    "keyword": null,
+                    "type": 9,
+                    "flags": 0,
+                    "position": null
+                }
+            ],
+            "count": 5,
+            "idx": 5
+        },
+        "delimiter": ";",
+        "delimiterLen": 1,
+        "strict": false,
+        "errors": []
+    },
+    "parser": {
+        "@type": "PhpMyAdmin\\SqlParser\\Parser",
+        "list": {
+            "@type": "@1"
+        },
+        "statements": [
+            {
+                "@type": "PhpMyAdmin\\SqlParser\\Statements\\WithStatement",
+                "withers": {
+                    "A": {
+                        "@type": "PhpMyAdmin\\SqlParser\\Components\\WithKeyword",
+                        "name": "A",
+                        "columns": [],
+                        "statement": null
+                    }
+                },
+                "cteStatementParser": null,
+                "options": {
+                    "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
+                    "options": []
+                },
+                "first": 0,
+                "last": 3
+            }
+        ],
+        "brackets": 0,
+        "strict": false,
+        "errors": []
+    },
+    "errors": {
+        "lexer": [],
+        "parser": [
+            [
+                "A closing bracket was expected.",
+                {
+                    "@type": "@6"
+                },
+                0
+            ],
+            [
+                "Unexpected end of the WITH CTE.",
+                {
+                    "@type": "@6"
+                },
+                0
+            ]
+        ]
+    }
+}

tests/data/parser/parseArrayErr3.out

@@ -239,6 +239,14 @@
     },
     "errors": {
         "lexer": [],
-        "parser": []
+        "parser": [
+            [
+                "A closing bracket was expected.",
+                {
+                    "@type": "@17"
+                },
+                0
+            ]
+        ]
     }
 }