Changeset 41501 for branches/4.4/src/wp-includes/wp-db.php

Timestamp:

09/19/2017 06:14: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.

Merges [41496] to 4.4 branch.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (2 diffs)

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

@@ -1271 +1271 @@
                 $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 );
@@ -2832 +2833 @@
 
                                         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.