From 6f766f8c52e932d00133da565dcd61bffa41ea1e Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Wed, 16 Jul 2025 11:16:58 +0200 Subject: [PATCH] PostgreSQL: Limit dollar-quoted strings --- adminer/sql.inc.php | 2 +- externals/jush | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php index f774bf10..3977711e 100644 --- a/adminer/sql.inc.php +++ b/adminer/sql.inc.php @@ -69,7 +69,7 @@ if (!$error && $_POST) { } $commands = 0; $errors = array(); - $parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|' . $line_comment . '|$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : ''); + $parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|' . $line_comment . '|$' . (JUSH == "pgsql" ? '|\$([a-zA-Z]\w*)?\$' : ''); $total_start = microtime(true); $adminer_export = get_settings("adminer_import"); // this doesn't offer SQL export so we match the import/export style at select diff --git a/externals/jush b/externals/jush index 2f564fdb..a0ac1fcd 160000 --- a/externals/jush +++ b/externals/jush @@ -1 +1 @@ -Subproject commit 2f564fdbdbdbcd745eac711fa963f1612b73eac0 +Subproject commit a0ac1fcdd69fda8d55c3b9e2a86049d37e4718d0