Changeset 41496

Timestamp:

09/19/2017 05:55:33 PM (9 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.

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (2 diffs)
• tests/phpunit/tests/db.php (modified) (2 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1253 +1253 @@
                 $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 );
@@ -2822 +2823 @@
 
                                         if ( is_array( $value['length'] ) ) {
-                                                $queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING $connection_charset )", $value['value'], $value['length']['length'] );
+                                                $length = sprintf( '%.0f', $value['length']['length'] );
+                                                $queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), $length ) USING $connection_charset )", $value['value'] );
                                         } else if ( 'binary' !== $charset ) {
                                                 // If we don't have a length, there's no need to convert binary - it will always return the same result.

trunk/tests/phpunit/tests/db.php

@@ -274 +274 @@
         }
 
+
         /**
          * Test that SQL modes are set correctly
@@ -1116 +1117 @@
                 $this->assertSame( 'utf8_general_ci', $result['collate'] );
         }
+
+        /**
+         *
+         */
+        function test_prepare_with_unescaped_percents() {
+                global $wpdb;
+
+                $sql = $wpdb->prepare( '%d %1$d %%% %', 1 );
+                $this->assertEquals( '1 %1$d %% %', $sql );
+        }
 }