Skip to content

Database: Prevent SQL FROM keyword matching inside string literals in wpdb::get_table_from_query() #13363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jorgelr771 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+4 −1
Open

Database: Prevent SQL FROM keyword matching inside string literals in wpdb::get_table_from_query() #13363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/class-wpdb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3874,7 +3874,7 @@ protected function get_table_from_query( $query ) {
// Quickly match most common queries.
if ( preg_match(
'/^\s*(?:'
. 'SELECT.*?\s+FROM'
. 'SELECT.*\s+FROM'
. '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?'
. '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
. '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
Expand Down
3 changes: 3 additions & 0 deletions tests/phpunit/tests/db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,9 @@ public function data_get_table_from_query() {

// @ticket 63777
"SET STATEMENT max_statement_time=1 FOR SELECT * FROM $table",

// @ticket 43664
"SELECT c AS 'a from b' FROM $table",
);

$querycount = count( $queries );
Expand Down
Loading