Changeset 41506

Timestamp:

09/19/2017 06:42:25 PM (8 years ago)

Author:

aaroncampbell

Message:

Database: Hardening to bring wpdb::prepare() inline with documentation.

wpdb::prepare() supports %s, %d, and %F as placeholders in the query string. Any other non-escaped % will be escaped.

Merges [41496] to 3.9 branch.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)
• tests/phpunit/tests/db.php (modified) (1 diff)

branches/3.9/src/wp-includes/wp-db.php

@@ -1217 +1217 @@
         $query = preg_replace( '|(?<!%)%f|' , '%F', $query ); // Force floats to be locale unaware
         $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
+        $query = preg_replace( '/%(?:%|$|([^dsF]))/', '%%\\1', $query ); // escape any unescaped percents 
         array_walk( $args, array( $this, 'escape_by_ref' ) );
         return @vsprintf( $query, $args );

branches/3.9/tests/phpunit/tests/db.php

@@ -709 +709 @@
         return 'fake_col_charset';
     }
+
+    /**
+     *
+     */
+    function test_prepare_with_unescaped_percents() {
+        global $wpdb;
+
+        $sql = $wpdb->prepare( '%d %1$d %%% %', 1 );
+        $this->assertEquals( '1 %1$d %% %', $sql );
+    }
 }