Merge #340 - Fix BufferedQuery when it has an odd number of backslash…

…es in the end Pull-request: #340 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Aug 14, 2021 · 9eac28f · 9eac28f
2 parents 998338c + 97773b7
commit 9eac28f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Utils/BufferedQuery.php b/src/Utils/BufferedQuery.php
@@ -192,7 +192,7 @@ public function extract($end = false)
              * be ignored.
              */
             if ((($this->status & static::STATUS_COMMENT) === 0) && ($this->query[$i] === '\\')) {
-                $this->current .= $this->query[$i] . $this->query[++$i];
+                $this->current .= $this->query[$i] . ($i + 1 < $len ? $this->query[++$i] : '');
                 continue;
             }
 

diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php
@@ -113,6 +113,18 @@ public function extractProvider()
                 ),
             ),
 
+            array(
+                "SELECT \\",
+                8,
+                array(
+                    'parse_delimiter' => false,
+                    'add_delimiter' => false,
+                ),
+                array(
+                    "SELECT \\",
+                ),
+            ),
+
             array(
                 "CREATE TABLE `test` (\n" .
                 "  `txt` varchar(10)\n" .